From patchwork Sun Sep 27 09:08:18 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: 304346 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.7 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,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 79FFEC4727E for ; Sun, 27 Sep 2020 09:09:26 +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 0A9A023977 for ; Sun, 27 Sep 2020 09:09:26 +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="X5WvMunj" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0A9A023977 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]:59360 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kMSgO-0006Av-U6 for qemu-devel@archiver.kernel.org; Sun, 27 Sep 2020 05:09:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49946) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kMSfT-0004Xx-BD for qemu-devel@nongnu.org; Sun, 27 Sep 2020 05:08:27 -0400 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]:51089) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kMSfR-00029f-QY for qemu-devel@nongnu.org; Sun, 27 Sep 2020 05:08:27 -0400 Received: by mail-wm1-x333.google.com with SMTP id e17so3376052wme.0 for ; Sun, 27 Sep 2020 02:08:25 -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=gSWJZnKhOrC53eEU7BCKaT5VT2GqivKC/fTv2rJCfmw=; b=X5WvMunjUsLtd2mptGhZleNmCFMuZ4w7XejQhfK2oyhGIpeC+BchQD4w8YwsF/wILH O1nqo6JcAGIOORTxzHo5WsaA0XONqTOTA77relREpEfXsje6Xh/qrtVEgbwLnDxkNkye begFE2y963So5IYztpwkv5z5D2bn2JKEM2M2eOcvr5E+lIzd+wx1maz/F1ftgan9uRv+ ysv3cEECIW2LnX6eME5yeKwE+Pxf+ZPoFIc6mtuVgsj3lUq04a09uvFpT/K6nIEv7axG stzyQkPIfoxXe9NXt8IhgG6tytG+SYx61SL29sxSVmI0zi9lJ9WLdJdXfz6PMd7ibMuz 3JRA== 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=gSWJZnKhOrC53eEU7BCKaT5VT2GqivKC/fTv2rJCfmw=; b=nqtU6Zo2p9Kpq2b68NWAghLhdiNkDwXBs9TUX9h//E/mj/kDN3QWq3I28FVqCtoQ/y cniEr4DsCjNnRVbu/1GaooFdzlr/kBia+VGXsU6MQYQNJNal8iS83D9GmSydvZi8Hh4D BJFRKh0gL6YBAy05wOOreZcbu2+IR+TizKYPaD2Zlp/vK/zOs4RbhQq1BPeFXiWgnMFs w7B2puciHttjDDzSwOCDrz72p1ARCpyc/8GxM6+X8Rv1sB+r0fPj/NG2wRO1eneaKjUC aYSX4OU9CuPL0GaJuIOICZKEqHlEA603CRwiqfQ00V9EFiq1N08+DNwLsQmxL0ZSZEU1 pciA== X-Gm-Message-State: AOAM532Foy2RzufcyGISrZvvsFZ/0yF7t8WKn6T5e9OrAYsz5ng2j6li wBkjaEyVLy4gTOZT/yFnNO9TQVQ1Li4= X-Google-Smtp-Source: ABdhPJwGxE71rID2mFA3DEuK+vzDWzKrydocZuPZ2wGQitxZ8AgaDXRVy2kjMCPnlkwSvJiegrpvew== X-Received: by 2002:a1c:7911:: with SMTP id l17mr6084925wme.179.1601197703999; Sun, 27 Sep 2020 02:08:23 -0700 (PDT) Received: from localhost.localdomain (74.red-83-53-161.dynamicip.rima-tde.net. [83.53.161.74]) by smtp.gmail.com with ESMTPSA id y6sm9007187wrn.41.2020.09.27.02.08.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 27 Sep 2020 02:08:23 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 1/3] util/cutils: Introduce freq_to_str() to display Hertz units Date: Sun, 27 Sep 2020 11:08:18 +0200 Message-Id: <20200927090820.61859-2-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200927090820.61859-1-f4bug@amsat.org> References: <20200927090820.61859-1-f4bug@amsat.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::333; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-x333.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.249, 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: Damien Hedde , "Edgar E . Iglesias" , Luc Michel , Eduardo Habkost , Peter Maydell , Havard Skinnemoen , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Tyrone Ting , Alistair Francis 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. Signed-off-by: Philippe Mathieu-Daudé --- include/qemu/cutils.h | 12 ++++++++++++ util/cutils.c | 10 ++++++++++ 2 files changed, 22 insertions(+) diff --git a/include/qemu/cutils.h b/include/qemu/cutils.h index eb59852dfdf..0186c846e9c 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 36ce712271f..dab837fd8b8 100644 --- a/util/cutils.c +++ b/util/cutils.c @@ -885,6 +885,16 @@ 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 *suffixes[] = { "", "K", "M", "G", "T", "P", "E" }; + unsigned unit_index = log10(freq_hz) / 3; + + return g_strdup_printf("%0.3g %sHz", + freq_hz / pow(10.0, unit_index * 3.0), + suffixes[unit_index]); +} + int qemu_pstrcmp0(const char **str1, const char **str2) { return g_strcmp0(*str1, *str2); From patchwork Sun Sep 27 09:08:19 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: 272668 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.7 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,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 65ED3C4346E for ; Sun, 27 Sep 2020 09:09:26 +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 EABCD2389F for ; Sun, 27 Sep 2020 09:09:25 +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="mdPBjNfc" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org EABCD2389F 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]:59402 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kMSgO-0006C1-Oz for qemu-devel@archiver.kernel.org; Sun, 27 Sep 2020 05:09:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49954) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kMSfU-0004YQ-EJ for qemu-devel@nongnu.org; Sun, 27 Sep 2020 05:08:28 -0400 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:39368) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kMSfS-00029k-P8 for qemu-devel@nongnu.org; Sun, 27 Sep 2020 05:08:27 -0400 Received: by mail-wr1-x444.google.com with SMTP id k10so5270722wru.6 for ; Sun, 27 Sep 2020 02:08:26 -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=g/6nKkvgWnq0c/AG8DfCxF9NNLJNAWyxVfnfIeVT6t8=; b=mdPBjNfcPkLfBgSUQeZDh+mxzVmtg/H2GK1HTBzqmcprES/nCEsPACKP5l4ISdbrH5 mdJK4dtnR8oPAl3om5xjhlnGb+44+fppxFf23MQuZarjg1blWGecIZOwlXxqeXnU02rs zvOMlCgQsuM2EbGH5GwqmjLTwrGWczShSFvVleovAQsHo5aHLhEx8qbla3uexYANv316 3nRlSfdvCoVgYInxlbt8ufDfCG/mUmZZOl9pmKhOGvcXYTRKso1L3wnDMEa79m7Wvlxi J94k1DA9MXHMEpZ5PebOaooBdQV9xMnHctXe+mgCRKBmpVGoY5/s4D3dF+7smpJFX0XR Hh/w== 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=g/6nKkvgWnq0c/AG8DfCxF9NNLJNAWyxVfnfIeVT6t8=; b=B4eDdB2Sd/iwJzvrpmqFsoo91n1pjGQOqZBEL9oIw4GN3eat4+j+t4qwYUwyu27OvJ 8m1Koc9pKsM61zyhZ8eNdSa7v9WzUvay6oZuHzp1BBUtd590q134T4sToKc6BLkcYg3Q /LEviVxGgQl7Et1Vc0TdbOJMFCHu5cMGB1TrCMusM+QYjgIo8NPn+mrh2St5yVlklbPq Q4QAZh2psugoxpAXivBOMIinjlNnbkSszwSVgjj3HiyFO1cCxs6PHbYI46t3QYwZnzqn kz5YwwqkX//zBOAY2KLx4fvamivJcaFh1f2S4I6isNqMnC0sQOj9yuCy2aFAKvGFVMFW s7Sw== X-Gm-Message-State: AOAM530JYfdm2gKVsOPZZ+aAY5WllsX/8nCymmFanfFCM0W06idrxXkv noywLtF8D/VFA9rALn75NxrUvAKoOi4= X-Google-Smtp-Source: ABdhPJzKaiDMaImaZToR7YXr9MEBSOLaHTuNCojcQODEJemcetZXMiWfa4KQ0h8DDEwJihbqbSoUjw== X-Received: by 2002:a5d:4d01:: with SMTP id z1mr13010243wrt.366.1601197705256; Sun, 27 Sep 2020 02:08:25 -0700 (PDT) Received: from localhost.localdomain (74.red-83-53-161.dynamicip.rima-tde.net. [83.53.161.74]) by smtp.gmail.com with ESMTPSA id y6sm9007187wrn.41.2020.09.27.02.08.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 27 Sep 2020 02:08:24 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 2/3] qdev-monitor: Display frequencies scaled to SI unit Date: Sun, 27 Sep 2020 11:08:19 +0200 Message-Id: <20200927090820.61859-3-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200927090820.61859-1-f4bug@amsat.org> References: <20200927090820.61859-1-f4bug@amsat.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::444; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x444.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.249, 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: Damien Hedde , "Edgar E . Iglesias" , Luc Michel , Eduardo Habkost , Peter Maydell , Havard Skinnemoen , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Tyrone Ting , Alistair Francis , =?utf-8?q?Daniel_P=2E_Be?= =?utf-8?q?rrang=C3=A9?= , Paolo Bonzini 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 Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Luc Michel Reviewed-by: Damien Hedde --- qdev-monitor.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/qdev-monitor.c b/qdev-monitor.c index e9b7228480d..a0301cfca81 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 Sun Sep 27 09:08: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: 304345 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.7 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,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 7DDCAC4741F for ; Sun, 27 Sep 2020 09:09:27 +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 2780B2389F for ; Sun, 27 Sep 2020 09:09:27 +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="SL+rwC+X" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2780B2389F 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]:59564 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kMSgQ-0006G3-59 for qemu-devel@archiver.kernel.org; Sun, 27 Sep 2020 05:09:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49964) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kMSfV-0004Zh-J7 for qemu-devel@nongnu.org; Sun, 27 Sep 2020 05:08:29 -0400 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:54381) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kMSfU-00029t-5j for qemu-devel@nongnu.org; Sun, 27 Sep 2020 05:08:29 -0400 Received: by mail-wm1-x342.google.com with SMTP id s13so3349172wmh.4 for ; Sun, 27 Sep 2020 02:08:27 -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=t3BREwZtlazYO80VUKfXukPFJ19pqUVUnt1RMwbxcUM=; b=SL+rwC+XFiGvq5yE0OJaxyFRRXicxzbYUhe7t0JtPPMFhc8PbWEK0m/3o4tIbMXKhV XZjvaf9wb656+H7EfHcKit4Cz1phJNU6vQJF8CKWbhFUgzVk1C9vDuhJrSirEU/CToqY re7uJfr6PBfRIpRK4exMIucLuffOSI4ARlj+0mr03LA4yhGkDyGbUb5TqCvlhnJP0cRJ eQ0hHqumqj4mhgBCuff+b7esWZQCPybpGu1AUMGcvcH3UsHSBovsYj6CeaaBiuzwkttc AsgXny808rjLmgKkBfaXphTw2QAELHKmdbFan7mvTIpayr6kAOj1iYVsptG4cr/Cy7VO LXkg== 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=t3BREwZtlazYO80VUKfXukPFJ19pqUVUnt1RMwbxcUM=; b=CXQd33xsb2wPCI9FNA36v5j/sUIK8CP+b7u/gllrkEZxgW5fS9Ijy6auYRXdyE/uln rXcvogdBbeVFiqIVQs/ZgyI2zdrjqdsvw2i3R6TPucx7SLv+ZSzwJirRSmcAfOWB/SK0 9xAourEvNSWhOelRb35rgb73VTLnv1W1IfUhRiP6ZafhpFmPcZz//XvzE1qFVxS/BOz6 xlt0GUmPuNcfQ/7CCTsWE90QoF/bqm5ALHQA1oyco5Mg80ZjxYoG10ZlDLZ5N8E4tVZ5 2df32+YEz5GIQatzVAGBM1P7cf1ZPViseRmTzNvjJy1C0VQeBjos4knzikEwltD15nv9 smgg== X-Gm-Message-State: AOAM5313b7PFZDX3VDWvzSEo4kVXyHRa4MZqXVaoDEK/9nub1gUvx9Zj QEiK+jAkQDVoChfx9QKwrUZyNm403bM= X-Google-Smtp-Source: ABdhPJyAO6B3/PsaFvI5o0iZWWAVH+pvG4PCweOMTLUpLnb5WiEy44yJ7nYxjGnFMHxWYX0tDMWIRA== X-Received: by 2002:a1c:9d42:: with SMTP id g63mr6267355wme.20.1601197706424; Sun, 27 Sep 2020 02:08:26 -0700 (PDT) Received: from localhost.localdomain (74.red-83-53-161.dynamicip.rima-tde.net. [83.53.161.74]) by smtp.gmail.com with ESMTPSA id y6sm9007187wrn.41.2020.09.27.02.08.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 27 Sep 2020 02:08:25 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 3/3] hw/qdev-clock: Display error hint when clock is missing from device Date: Sun, 27 Sep 2020 11:08:20 +0200 Message-Id: <20200927090820.61859-4-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200927090820.61859-1-f4bug@amsat.org> References: <20200927090820.61859-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.249, 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: Damien Hedde , "Edgar E . Iglesias" , Luc Michel , Eduardo Habkost , Peter Maydell , Havard Skinnemoen , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Tyrone Ting , Alistair Francis , =?utf-8?q?Daniel_P=2E_Be?= =?utf-8?q?rrang=C3=A9?= , Paolo Bonzini 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). Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Luc Michel --- 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 47ecb5b4fae..33bd4a9d520 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;