From nobody Sun May 19 20:29:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.44 as permitted sender) client-ip=209.85.221.44; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f44.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.44 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1601570608; cv=none; d=zohomail.com; s=zohoarc; b=KZKchUhQAhrHMRIYB0EbvMJ5SATaMB9ZBJU73lHJklKxQ7DXinQGcLq+FbZubTv39yu4Q70u1XqHPRzTNgGHt+LQxjiYzO4ASSmUmivva9AyM/QLD1OzrXHDG0zuhNCLeREP3GqYFLjJSx3dtPuCz+2GalUPi1emJ/MSiWWxXFc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1601570608; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=qkYlQ2hG55eOJBhaI2ddQgrPjAkAJgDAI2/vDJUHE4M=; b=bjGeju5aNL14sTxbNWGUDtM837/1b5mxXlf/ZdA9/bUsbbQkdoGC6TJeXC6a3PCvvLtEnLYl28wueWQp+a7BZWPfjed7QVFNvkCr+JChdpiYJVYxkTuxFybVsa6QKJqhqYQ5h3O9MFu6lj7X9VlOIFLtA2/2mtFfy7aVMNOw8GQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.44 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) by mx.zohomail.com with SMTPS id 1601570608879832.3915022849593; Thu, 1 Oct 2020 09:43:28 -0700 (PDT) Received: by mail-wr1-f44.google.com with SMTP id g4so6593786wrs.5 for ; Thu, 01 Oct 2020 09:43:28 -0700 (PDT) Return-Path: Return-Path: 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) 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=pH7egYT0rWBqFf0Dae0DTk0CK86vZKYel7+DXLuXkKqlYGCMEgUHigPejqx7DCBHio 6qBtfuh8nPb7Hct4Rw5my9Luc5ckqOi4B9ygiAj+I6gvvWLWDJo8cRjRht6YCSyfdZNc ih7lrlCdc3lSMYPOKmrtXvX6ifRXleYb4LZdVMNhXSFPw2immPvWG6hNe5p2ox/jXBtD UZyDOj2cJRXnuT+0VPnX7fmJ7qQURznEKZN/TuJr2o55V2/+mRT0wysIQ2d6hXX/5vhD 3Rt3ZSMXbWCuMGMH7fpfjMCs/MC5AFVGsZUBkCguQDlKSYhNBgmAMBxFn4NIp0YsNG1T a7/Q== X-Gm-Message-State: AOAM532igiA4DcKjeSbu1ldm12WZxNG8a60g582SOjW9AQbvxBqNeXGn rospoLm1S0xYtqFtlm0g9lQ= 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) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Luc Michel , Peter Maydell , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Eduardo Habkost , Havard Skinnemoen , "Edgar E . Iglesias" , Damien Hedde , Alistair Francis , Tyrone Ting , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= 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 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) 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=C3=A9 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); =20 char *size_to_str(uint64_t val); =20 +/** + * 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") =20 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]); } =20 +char *freq_to_str(uint64_t freq_hz) +{ + static const char *const suffixes[] =3D { "", "K", "M", "G", "T", "P",= "E" }; + double freq =3D freq_hz; + size_t idx =3D 0; + + while (freq >=3D 1000.0 && idx < ARRAY_SIZE(suffixes)) { + freq /=3D 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); --=20 2.26.2 From nobody Sun May 19 20:29:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.68 as permitted sender) client-ip=209.85.128.68; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f68.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.68 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1601570610; cv=none; d=zohomail.com; s=zohoarc; b=nPAIeKjZrdR1ChTcJfV/gTA+D6Pt0VzMISPK4lrL9JCHqJ71g5Yj/B3WLDb9RG8SSB4L3asUXKWK10TokOCMxijw0Bbo1m8ldCVlQn6Fob4id4LtmbHM1/EQlNzxdbqXdU+JKWM6JPK9RzdMuowX3DYnLHUO0Mq3U9of7KX+ink= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1601570610; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=aalZfwDNGdwdW5/IIKOVPxUHA6XH4oPdaqpcACoVNTg=; b=dZ68YFSqTO0edycKpxY5JJa/R12A+q0bKPqR4DRPIe7u5dx7DVKY6KGsr9NkNGwST5Ant4v/kZPqeuydYz4+dlYbwD7wJeL/ABY25KEx8b+6opgkZz/X2hQnmDmPx4Y/8FtSNvMypY1uVouNrg/zz6sbaik8p8R/r/y72RmuOcM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.68 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by mx.zohomail.com with SMTPS id 1601570610369481.1710076033769; Thu, 1 Oct 2020 09:43:30 -0700 (PDT) Received: by mail-wm1-f68.google.com with SMTP id l15so2627720wmh.1 for ; Thu, 01 Oct 2020 09:43:29 -0700 (PDT) Return-Path: Return-Path: 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) 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=VfyjpuIHff+Rbjo5TN1OqPvm4qWpC8ZhuunSgfFGv2lljWlTYyOs0VscV5eNd051dO sEOHwCJB66V01ykgL49vD8nJQsjnta9Vxzlpdkg6XETgPxHz7pwKVFTYRNIqQb3nmdN/ QzF5AiEETYF61ySBU7SWAHER1FoYPAWuIfF7VxNlLT3TAsNQhS30yr6DA3vFF7PcRgbL tQ2elvhY6eIf1lYaIENcAWXDnNN55pY7HuN9+hUY8gLr40NS0HYNQg+5tRp/OkGqrhV9 lCub/2wf0vkwD8yyJSF7XsXIHY5wDaQgblNV+oU5EVhPNQdDbv0fRpF7qs/pVNtHfvR3 ftug== X-Gm-Message-State: AOAM530kZWX3qYTw4JZ2pGTr/sKU9ptPoOcqB8R0jXuPKnp4bs3V5qSJ OhOpwdlVC26VKWaPJKXlu+0= 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) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Luc Michel , Peter Maydell , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Eduardo Habkost , Havard Skinnemoen , "Edgar E . Iglesias" , Damien Hedde , Alistair Francis , Tyrone Ting , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= 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 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) 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=3D3.333333e+07 mmio 00000000f8000000/0000000000001000 After: dev: xilinx,zynq_slcr, id "" clock-in "ps_clk" freq_hz=3D33.3 MHz mmio 00000000f8000000/0000000000001000 Reviewed-by: Luc Michel Reviewed-by: Damien Hedde Signed-off-by: Philippe Mathieu-Daud=C3=A9 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=3D%e\n", + g_autofree char *freq =3D NULL; + + freq =3D freq_to_str(clock_get_hz(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); } class =3D object_get_class(OBJECT(dev)); do { --=20 2.26.2 From nobody Sun May 19 20:29:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.66 as permitted sender) client-ip=209.85.128.66; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f66.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.66 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=1601570611; cv=none; d=zohomail.com; s=zohoarc; b=n2STuIxRjeUqyAdrqhoRkH+wZINioHQ7HTcmzm2mr1gUsHgz/DwtyE/yoRfyqXoyqnhaMO+9wzOrMkNMEqGV/SiLL7KzJLcYRunhaKaJrjJFRI8gCcmGhMPIZS6M13oxXqO5ix741YSEYF2QCUulRX8j6BQkAhBkiBHhySL+mBE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1601570611; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=x6kGxn4MIKwxLSY1d8I1BClrthzon31d/eVho3rjiZ8=; b=TNhPRawODye1u+iwqCHimRlUCDrZSJMT+YDtS4b7TZpuVeeSUc7TYVLs5jcXQwUS7t1dgTPHBPQ8tHcXO9Ooa4hW/gEQqLxckyIOD7ndTA3xlJqavBnOTg945Jy548t4s4BcVupN2pFiVTAlxo6V2v1oIJOiIcTwcKXl4IzuF3U= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.66 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by mx.zohomail.com with SMTPS id 1601570611777399.24962737647706; Thu, 1 Oct 2020 09:43:31 -0700 (PDT) Received: by mail-wm1-f66.google.com with SMTP id v12so3853851wmh.3 for ; Thu, 01 Oct 2020 09:43:31 -0700 (PDT) Return-Path: Return-Path: 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) 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=YK2VdXhhNLM+LmjBKQjU9RH7bDk8K70IJmyY/a+c/zC54fRmp0VpijnlWaUlSGB+Gt q/kFsBXZHCBlegfnweBIavCcGO1pfqgoo+2+f8Rs1GTw8Oc9inBznZgYEdBxIPuamArk W7bQTlH+BOkjQWz3FvQ6PpGoWmk0XFs8o9PwljLoxB0VxlP9B2+FRuUDvxblPbwJOLND nCNBTwXNu/oQNqdN1DpWY/1vi04byGGj9OLARA9dBXNrJDvny4UCR458lUo85Mh6ebvU UXdGe7dHQzcsF0IFq0u8v4ROOyXG2I+kmb5s4LM/nWYsFj76KtUPPEzaFdr1b/FhVT3T 6v+Q== X-Gm-Message-State: AOAM532eF/ypvSZU5TaxLUkhU6NBUm2XnInI/Fg1cn8sO+iIrwXE3z11 mymNGKKf02bPxgdN7KJ7BMU= 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) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Luc Michel , Peter Maydell , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Eduardo Habkost , Havard Skinnemoen , "Edgar E . Iglesias" , Damien Hedde , Alistair Francis , Tyrone Ting , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= 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 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) 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=C3=A9 --- 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 @@ */ =20 #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); =20 ncl =3D 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); =20 return ncl->clock; @@ -165,6 +171,11 @@ Clock *qdev_get_clock_out(DeviceState *dev, const char= *name) assert(name); =20 ncl =3D 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); =20 return ncl->clock; --=20 2.26.2