From nobody Mon Feb 9 09:53:27 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1592294069; cv=none; d=zohomail.com; s=zohoarc; b=GtCzurKwXEB8eiTxPL5C6erf4smAIB6YwgUTd0WlNd0OvRySBCdVfXKawIq+TsInP0giP26R+g6CkSXF5vl2XrcZVjtF2TQQxvVEAxtO0ahw6Bax3HPiIVL/r3G3sb4XT61/ex5uPoJ0nhm5LYDRRKf9bUGF/ob+FZjgNuYuygo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592294069; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=u02Arpcubj9mPZ8wYNHVoADOr5FJrLRUYb2irB7o4Ig=; b=n1mt83jlUZn4c+gHNWRpcdfhTv8ikk0ZarhespnPUNsU+R9FFwfylmkZyVhawgYF4ZTpmJIJH81ZSSx/m8tRl6XlAclfrcisKMeESZ4c22tZfNlApPxpzYn9V4zLaDVLYjY5ZfB+9oyv8nAfxtfmRctqcZd47N86xQuyYNj6AFM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1592294069282463.22403235788977; Tue, 16 Jun 2020 00:54:29 -0700 (PDT) Received: from localhost ([::1]:53976 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jl6QO-0000PM-26 for importer@patchew.org; Tue, 16 Jun 2020 03:54:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53888) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jl6NV-0003eA-6z; Tue, 16 Jun 2020 03:51:29 -0400 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:34407) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jl6NT-00084A-Jj; Tue, 16 Jun 2020 03:51:28 -0400 Received: by mail-wr1-x443.google.com with SMTP id r7so19697962wro.1; Tue, 16 Jun 2020 00:51:26 -0700 (PDT) Received: from localhost.localdomain (181.red-88-10-103.dynamicip.rima-tde.net. [88.10.103.181]) by smtp.gmail.com with ESMTPSA id q11sm28093538wrv.67.2020.06.16.00.51.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Jun 2020 00:51:24 -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=u02Arpcubj9mPZ8wYNHVoADOr5FJrLRUYb2irB7o4Ig=; b=NU6xdCpJWWMjotGt3hh8qLQaEU6IcuR807+1T9o24PWWNqD9Vogza4t5sE/67Lc+Ul RGfzxZSZE3DbR+GqQrdbaiR5Itv2TJ5BXlyrssUbjIyUavUjrD2sL32ipexO5Un6L8HN jChBwkWzR2d4Cahzr2jOrEAHMxxk3Nvvv00VClpD+StLtJp282jata4OgZXBnCyzhuHJ fiQtd6K4ljhhVoDkTZI+jjJkNZjozK9Q5hQMOo0FuF7f02NHidx60lb9OLa8Hq+rbBND c/5y0//UT6HrihapbCL3sNis3PVVmmf4Y/hXtSZpzXycZPTqZWz43ZOq67pcJlu4blwI cTEQ== 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=u02Arpcubj9mPZ8wYNHVoADOr5FJrLRUYb2irB7o4Ig=; b=sB9i9cEqcfUFeFbX9TDjMgB1Y/1w+PyCoubmqdEbvZXndPVIHJof2MtTyIujEucH2O 3tCGslzDLeAJDGv/bLqh5I5KWFvJtq+eVE2gT+bS8SCKK535pXBnjnt4h9D2iqJJ7bfL r+T9qNCNLXR0X99sj3Hm9saUU0UCMat+LJvQXoVclGWYhwgOTsY2Tu2X6HyAUIaV916W zj6hkcCzTUC7X5MlTllv5MgvquBTOb47pIZ6KN12ASOhoCAiCWVWe2TYWKIoY+/yR9v7 dR0HzCujmJnyLntEnvtF0t1SGlcYiYjtS7QRdaxoSKj90GPcNSPdiFhtdz+7YSlzQ9T0 WM/w== X-Gm-Message-State: AOAM530HZnPY6nW8AXq/VGctOoOsdsFWEYsoLFQKkqOONIAOMtpAt6n+ UA6rMSmt/e1N8BZ+8EnIONFRR7NQ X-Google-Smtp-Source: ABdhPJyvI98LxdXs/QaF0wr5dlrQ7y8cygnVOjolGcediY1CUVmrWxnbvLxbeYibXrGIgZMBGQIhoQ== X-Received: by 2002:a5d:4f09:: with SMTP id c9mr1617618wru.3.1592293885188; Tue, 16 Jun 2020 00:51:25 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 1/7] qemu-common: Briefly document qemu_timedate_diff() unit Date: Tue, 16 Jun 2020 09:51:15 +0200 Message-Id: <20200616075121.12837-2-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200616075121.12837-1-f4bug@amsat.org> References: <20200616075121.12837-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 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::443; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x443.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: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN 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: Kevin Wolf , Peter Maydell , qemu-block@nongnu.org, Corey Minyard , David Hildenbrand , Andrew Jeffery , "Michael S. Tsirkin" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Max Reitz , qemu-arm@nongnu.org, Joel Stanley , Paolo Bonzini , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) It is not obvious that the qemu_timedate_diff() and qemu_ref_timedate() functions return seconds. Briefly document it. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/qemu-common.h | 1 + softmmu/vl.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/include/qemu-common.h b/include/qemu-common.h index d0142f29ac..e97644710c 100644 --- a/include/qemu-common.h +++ b/include/qemu-common.h @@ -27,6 +27,7 @@ int qemu_main(int argc, char **argv, char **envp); #endif =20 void qemu_get_timedate(struct tm *tm, int offset); +/* Returns difference with RTC reference time (in seconds) */ int qemu_timedate_diff(struct tm *tm); =20 void *qemu_oom_check(void *ptr); diff --git a/softmmu/vl.c b/softmmu/vl.c index f669c06ede..215459c7b5 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -737,7 +737,7 @@ void qemu_system_vmstop_request(RunState state) } =20 /***********************************************************/ -/* RTC reference time/date access */ +/* RTC reference time/date access (in seconds) */ static time_t qemu_ref_timedate(QEMUClockType clock) { time_t value =3D qemu_clock_get_ms(clock) / 1000; --=20 2.21.3 From nobody Mon Feb 9 09:53:27 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1592293984; cv=none; d=zohomail.com; s=zohoarc; b=dR7QBumgBr71u1pXWl/Q/xGCKqceXp93Jo0OcnlRkysf6ul1Un1Z82DHQxpJRkikINff3ZH1cezShtYW7e1rwi9Zp1FfXQJQDW3327eSBuV0D2rTMdunX0q1E/OwGA398aQgI9p3BI4A+MAQJkjH2itiXGn2g8evMrIGT53QgVA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592293984; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=8+v1WtTiaBr/cU57D6WDEIafuRkg4EVCwsLaJ7Un5zA=; b=LmcY3dMCVYyit81kdsCshweK/hGK/Bb33f+QUf/2wy5j0XYOVFrqX4lfBx+JAZc/hGgpJo4ne1OokkrMrrvvrJd/Ziz/EtxSEV/EwFcFG98iQ/dU0AGUeijXHjNxSLgpkKhK6lTNmpq+lQiWPedEpWl559CzrrYm2iACA1i6/0U= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1592293984925423.22396606925565; Tue, 16 Jun 2020 00:53:04 -0700 (PDT) Received: from localhost ([::1]:46072 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jl6P1-0005fz-LX for importer@patchew.org; Tue, 16 Jun 2020 03:53:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53910) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jl6NX-0003fB-9k; Tue, 16 Jun 2020 03:51:31 -0400 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:45342) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jl6NV-00084L-Jy; Tue, 16 Jun 2020 03:51:30 -0400 Received: by mail-wr1-x444.google.com with SMTP id c3so19630760wru.12; Tue, 16 Jun 2020 00:51:27 -0700 (PDT) Received: from localhost.localdomain (181.red-88-10-103.dynamicip.rima-tde.net. [88.10.103.181]) by smtp.gmail.com with ESMTPSA id q11sm28093538wrv.67.2020.06.16.00.51.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Jun 2020 00:51: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=8+v1WtTiaBr/cU57D6WDEIafuRkg4EVCwsLaJ7Un5zA=; b=WqyEB6spwUThFV9nVg0pOI27fLw4PvX4EMshTCBLKZSa572rAt6aEq86ZFCFfYoUU+ tgoto0t1sgsKsd2e/xFNgoXNEzFso8nwlNdn2u09tm1ukKJ8d3tkTlGa1rAsMfUXfe5Y T1TYzcU8/iwY34qbxXV7WREAOF/S9SMSL0ejUYVXW8WvNWf2uMZMVihYevSlCYcKsaKZ e9sgn73S6WmG1Zz/DCfml31GnOEm52zqdxsAfG0NkoLynOqqaIIA2IDuQpOxyHqcI3So KV13Fzg+JFP+J+rdGOF1+97h3BlXbaBcMyG15qvS4HZt4Yk0fNHxwzfd+zTDYKnZgrVB oCzA== 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=8+v1WtTiaBr/cU57D6WDEIafuRkg4EVCwsLaJ7Un5zA=; b=qyStvECLHnCp8DYBY7ufOMCrsHiwin856jCDCp7F+b4iZERfvgzxTx6YYLcFgbFy3g Yk/E8pdUQZovSybGrLQf6hP3EqQvgFavjYjVKXbRAdvDNsrIfgr9uiJtVZ3rUrN6B2g+ taMMcnytWfxba5NqGzNaeEMn4BXxCb2Y79uHd/6qd90lru8D+h39gYJaptB0Ql21DGFf IhetqvfSPd7zC6PZiOLtFw029wVfPcvYzNJpxIk+lf/UYeHWDTnLYydVbXGduaw/GLCE 0IPlBCKlADqdb1bzjNtT0WPt1+fIkQg7DKSM/ny1AxU11AodCGOaHqscmuGrN6WOJZRm Gf1A== X-Gm-Message-State: AOAM531+i89Vu9R56dK8I5tKLEp7b9pbVP52gfhGsIJayqJa00lxtaHp O0amYlz1bmQ2OMDgsDa0kKd3XYJn X-Google-Smtp-Source: ABdhPJyVhsqAjnTuku/6hQtRl9inKCZTYIp+7/jbbB4OdUj3oQTfEA7fAkBKSHC2FPy7UG5FiQyngQ== X-Received: by 2002:adf:8067:: with SMTP id 94mr1545509wrk.427.1592293886437; Tue, 16 Jun 2020 00:51:26 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 2/7] block/qcow2: Document cache_clean_interval field holds seconds Date: Tue, 16 Jun 2020 09:51:16 +0200 Message-Id: <20200616075121.12837-3-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200616075121.12837-1-f4bug@amsat.org> References: <20200616075121.12837-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 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; 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: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN 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: Kevin Wolf , Peter Maydell , qemu-block@nongnu.org, Corey Minyard , David Hildenbrand , Andrew Jeffery , "Michael S. Tsirkin" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Max Reitz , qemu-arm@nongnu.org, Joel Stanley , Paolo Bonzini , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) It is not obvious the 'cache_clean_interval' field holds a value expressing seconds. Add a brief comment. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- block/qcow2.h | 1 + 1 file changed, 1 insertion(+) diff --git a/block/qcow2.h b/block/qcow2.h index 7ce2c23bdb..fa5c2e64a1 100644 --- a/block/qcow2.h +++ b/block/qcow2.h @@ -310,6 +310,7 @@ typedef struct BDRVQcow2State { Qcow2Cache* l2_table_cache; Qcow2Cache* refcount_block_cache; QEMUTimer *cache_clean_timer; + /* Interval for cache cleanup timer (in seconds) */ unsigned cache_clean_interval; =20 QLIST_HEAD(, QCowL2Meta) cluster_allocs; --=20 2.21.3 From nobody Mon Feb 9 09:53:27 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1592293995; cv=none; d=zohomail.com; s=zohoarc; b=f0Eah8S3xSm8cMODDv1dtHJi1nJIHvZGNlV11TmTMNpuP2EmwhrhAG3xa7vp35YW0DcLLepIZG3TNvhXixresuvT/lszpMe/URDC+9o/+559wphRlA+BgDiZNywdV/h1KJX8Wn4XOLrYxcUj1+pZpmuR61RY3YJyNHQFAXHpSY8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592293995; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=/VMXSScmCR3d2/xkIxPp+LwxksxY5VIsQUSqaq3gT2w=; b=XFbAyHOhUiT9R85loYox/rPq29gxo2Wk1fECKaObX+PvU6QFJd/hqyHo0bNLlSdo4wbGnSi3SuRzjBssWnEDCrz1+1AbxJabiHIqDTq+amiCTLFSMnuEk2Ef9Tp215fuIVt/mcpJKW0qBlWbnEByA2lhwQ5G9y+1y8mXwt7EErY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1592293995486596.8552561763995; Tue, 16 Jun 2020 00:53:15 -0700 (PDT) Received: from localhost ([::1]:47056 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jl6PC-000655-7s for importer@patchew.org; Tue, 16 Jun 2020 03:53:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53916) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jl6NX-0003gL-Q2; Tue, 16 Jun 2020 03:51:31 -0400 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:34409) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jl6NV-00084a-UO; Tue, 16 Jun 2020 03:51:31 -0400 Received: by mail-wr1-x444.google.com with SMTP id r7so19698101wro.1; Tue, 16 Jun 2020 00:51:28 -0700 (PDT) Received: from localhost.localdomain (181.red-88-10-103.dynamicip.rima-tde.net. [88.10.103.181]) by smtp.gmail.com with ESMTPSA id q11sm28093538wrv.67.2020.06.16.00.51.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Jun 2020 00:51: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=/VMXSScmCR3d2/xkIxPp+LwxksxY5VIsQUSqaq3gT2w=; b=LgKlPInvpyWcJQMbinEVBrhvjBxSLgik0kvjvBXJ5vLSHydazZm1npSvulmJf7g3ZH vcT06mhNwvaHJYzKexKhtPj3X1uBs26KJr/3g/Uo9f4JAi0yOjI+ggFED/eI0EIkz+dj ACegk5qJrKPDUdyxK64vooWuXSaDufmJHKuzwy3GSVwlFGKsCgB82NKF81X9s2w+15Mq 4uJi2mzFI39tn702h5DYgZzIzDyIGI0h9DGV5uY1upX3G5mvZnz3sMexLNHh8qpoVE8J Wg6RLX76p2BP+SM4tkB06dBfc17szJClCmIftRXo4LcH9vhs4Oj86BpiP4C0Uz7dgKN9 oKEA== 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=/VMXSScmCR3d2/xkIxPp+LwxksxY5VIsQUSqaq3gT2w=; b=AsxLDro4zZAdu4jTRPOhclVAfS/ggw/T1El3HPDjqbreIUALnFy4jX4YvSnkVlJZvE 8YNzH4LfkcO8ID5uZ1LcSctnPgucgYshXhqpONdbypwS9CeUwJ3oWa3NmZJenR46sH2D QAWv5OADI76hHcC4F3zd2iD7m7GvuLGb1TuNisUaed6N9ukp91zNDqZFNSop1HcUiVda ypb8iOSusEFcvzdEjnRmq/0qCJvRMYyM+LgaJ2dVPU8XtuS9t7U6Ya9IY1AoHiuW4ZHK 9J3La/aJXqg6Xie8umBw6kiOfG5UhukeamcM1nkduIeTPmzaS4LqotFOypqcTxJgECKf gv2A== X-Gm-Message-State: AOAM533O70R29T0x8VwW+cP1z8Ul5LO5kZLcPQNBsAP5fZ5l6gyKB3JV Ss+QvJe5qqzQlbZ/Yhn2L3mdOR5z X-Google-Smtp-Source: ABdhPJw1CEDYD8VhkYNnlo/tDBeikFnfie1kFgHNOTqW2vK5wDAq1ur41dKnqMxnQXpjcMNkv+hOSw== X-Received: by 2002:adf:f0d2:: with SMTP id x18mr1633039wro.250.1592293887799; Tue, 16 Jun 2020 00:51:27 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 3/7] block/curl: Reduce timer precision to milli-second Date: Tue, 16 Jun 2020 09:51:17 +0200 Message-Id: <20200616075121.12837-4-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200616075121.12837-1-f4bug@amsat.org> References: <20200616075121.12837-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 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; 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: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN 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: Kevin Wolf , Peter Maydell , qemu-block@nongnu.org, Corey Minyard , David Hildenbrand , Andrew Jeffery , "Michael S. Tsirkin" , Mark Cave-Ayland , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Max Reitz , qemu-arm@nongnu.org, Joel Stanley , Paolo Bonzini , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) The current implementation uses nano-second precision, while the block driver is only used with a milli-second precision. Simplify by using a milli-second based timer. Rename the timer 'timer_ms' to have the unit explicit. Inspired-by: Mark Cave-Ayland Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- block/curl.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/block/curl.c b/block/curl.c index 6e325901dc..74950373aa 100644 --- a/block/curl.c +++ b/block/curl.c @@ -119,7 +119,7 @@ typedef struct CURLState =20 typedef struct BDRVCURLState { CURLM *multi; - QEMUTimer timer; + QEMUTimer timer_ms; uint64_t len; CURLState states[CURL_NUM_STATES]; char *url; @@ -148,11 +148,10 @@ static int curl_timer_cb(CURLM *multi, long timeout_m= s, void *opaque) =20 trace_curl_timer_cb(timeout_ms); if (timeout_ms =3D=3D -1) { - timer_del(&s->timer); + timer_del(&s->timer_ms); } else { - int64_t timeout_ns =3D (int64_t)timeout_ms * 1000 * 1000; - timer_mod(&s->timer, - qemu_clock_get_ns(QEMU_CLOCK_REALTIME) + timeout_ns); + timer_mod(&s->timer_ms, + qemu_clock_get_ms(QEMU_CLOCK_REALTIME) + timeout_ms); } return 0; } @@ -582,7 +581,7 @@ static void curl_detach_aio_context(BlockDriverState *b= s) } qemu_mutex_unlock(&s->mutex); =20 - timer_del(&s->timer); + timer_del(&s->timer_ms); } =20 static void curl_attach_aio_context(BlockDriverState *bs, @@ -590,8 +589,8 @@ static void curl_attach_aio_context(BlockDriverState *b= s, { BDRVCURLState *s =3D bs->opaque; =20 - aio_timer_init(new_context, &s->timer, - QEMU_CLOCK_REALTIME, SCALE_NS, + aio_timer_init(new_context, &s->timer_ms, + QEMU_CLOCK_REALTIME, SCALE_MS, curl_multi_timeout_do, s); =20 assert(!s->multi); --=20 2.21.3 From nobody Mon Feb 9 09:53:27 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1592294101; cv=none; d=zohomail.com; s=zohoarc; b=R222081U6x0DYkzlW0AJNrPOd+FDnSvgOs+AP2a6vBq7skK5RQnIVYFN807gQ8MllVFXfVaTOkDJ6/AWbcj0E9MKjs6iVRU6V/d/jEZp21XRReygEst01NV0s+SEr/fs9pameee9Ogs6mueq2+Ywzui4pee/rv76QjIvjJoDgfg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592294101; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=nNUziTErkLgYz4tRwUDCFKibDK7Kq+2uBOuQqz7FOdE=; b=U2oWpdMHbhU8O0kSyOucfEtA0d42fN3X6cmt/fJtd1ASDFYbwubMhAAe1KAl6+a7RCiskA9QvDbOzr+0YXvFyWqi0BuW35CaMDHE2Te+A/vImbAGVSFFkZ4QzJvFP5LET1h+TSuQxiI88Q/Krp9v7Qu8mVoVOhrbPqHJc6yfIrg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1592294101453701.1600866222574; Tue, 16 Jun 2020 00:55:01 -0700 (PDT) Received: from localhost ([::1]:55606 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jl6Qu-00013n-66 for importer@patchew.org; Tue, 16 Jun 2020 03:55:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53924) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jl6NY-0003jF-SS; Tue, 16 Jun 2020 03:51:32 -0400 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:41202) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jl6NX-00084r-6w; Tue, 16 Jun 2020 03:51:32 -0400 Received: by mail-wr1-x442.google.com with SMTP id j10so19659126wrw.8; Tue, 16 Jun 2020 00:51:30 -0700 (PDT) Received: from localhost.localdomain (181.red-88-10-103.dynamicip.rima-tde.net. [88.10.103.181]) by smtp.gmail.com with ESMTPSA id q11sm28093538wrv.67.2020.06.16.00.51.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Jun 2020 00:51: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=nNUziTErkLgYz4tRwUDCFKibDK7Kq+2uBOuQqz7FOdE=; b=EMXCBPQQiKZ0IiZlX2V9oIPUOIocKwAiFgJ87DIbemKuT55ZMwXBHSCQ0U3ocn1tWO 2gUlIy2C7w+mpcRxPG0O2l85DCKvbqHEcZSRvvrKqEY8SHjcy6yi3bsPl1tX3y7GaA7Q WNqFtDEQ/b/RRdF85QN3opwgKH1m0/bAdXcP520QisJFcqY341x10rcWRdFgeLNdTs7v ALWaAT9iYZIhZ1mre/JCGtbuGXTxinHP3bnPjVy2bQSUJn3bHJD508/KXxjCHjKNTszo GqRkYTaAhcS3ZnkpxkRFo4345EHZU/RDJT/Nbv/a2b6W0qE+aGGntMCe5s7pMi33OiY2 tqjQ== 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=nNUziTErkLgYz4tRwUDCFKibDK7Kq+2uBOuQqz7FOdE=; b=lTaWxdpG5H+r10ReT/iYfp1AdZkNiRs2F3A5eqglJM6GD2SmVjixBsQLnugtXAo7AP BMbY51IV3DX4gf06rAuUem9LL6OXXGjBzHyjC81WMrZf/wP3C8B3RzXlHDoA4myJt0Ba udC67zOPxhIaO7vnguySLlgwxqs7d8sjb7vbJlXxfyEG3rSzpQ9b6dliEKx0EeOx9VJQ w5zv9Wa55vxoc4aWDtr3G8A+sZMiJ3BwwtH/f8nqBYgkMG+sLJwLyjNqHFcD903jBVCd 97OpHkPZ3LHLr+gCQZTcAQVr9FEghjH170RfMRpmpKJ6ppgSs0QeOv2DlwzNfsxkLHkD /ZXQ== X-Gm-Message-State: AOAM533jnUhzrU7IdO+TPtbL7/fhfpq0elt8wz1QznBVX8Tz9lRJkV6U yzETY/cq3d3GRM9ecrPQkPChxpJ/ X-Google-Smtp-Source: ABdhPJyX7kxTW4XOQXjVEj5drS5upHp8ngPtIAsARqpAsxbPN7+9xQEPXiXWWQNW++v5bR9lKQRF/A== X-Received: by 2002:adf:e590:: with SMTP id l16mr1566679wrm.383.1592293889090; Tue, 16 Jun 2020 00:51:29 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 4/7] hw/virtio/virtio-balloon: Rename timer field including 'ms' unit Date: Tue, 16 Jun 2020 09:51:18 +0200 Message-Id: <20200616075121.12837-5-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200616075121.12837-1-f4bug@amsat.org> References: <20200616075121.12837-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 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::442; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x442.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: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN 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: Kevin Wolf , Peter Maydell , qemu-block@nongnu.org, Corey Minyard , David Hildenbrand , Andrew Jeffery , "Michael S. Tsirkin" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Max Reitz , qemu-arm@nongnu.org, Joel Stanley , Paolo Bonzini , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) To make code review easier, append the timer unit (milli-seconds) to its variable name. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: David Hildenbrand --- include/hw/virtio/virtio-balloon.h | 2 +- hw/virtio/virtio-balloon.c | 14 ++++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/include/hw/virtio/virtio-balloon.h b/include/hw/virtio/virtio-= balloon.h index d49fef00ce..8a85fb1b88 100644 --- a/include/hw/virtio/virtio-balloon.h +++ b/include/hw/virtio/virtio-balloon.h @@ -50,7 +50,7 @@ typedef struct VirtIOBalloon { uint64_t stats[VIRTIO_BALLOON_S_NR]; VirtQueueElement *stats_vq_elem; size_t stats_vq_offset; - QEMUTimer *stats_timer; + QEMUTimer *stats_timer_ms; IOThread *iothread; QEMUBH *free_page_bh; /* diff --git a/hw/virtio/virtio-balloon.c b/hw/virtio/virtio-balloon.c index 10507b2a43..ad67cd53e4 100644 --- a/hw/virtio/virtio-balloon.c +++ b/hw/virtio/virtio-balloon.c @@ -197,16 +197,17 @@ static bool balloon_stats_enabled(const VirtIOBalloon= *s) static void balloon_stats_destroy_timer(VirtIOBalloon *s) { if (balloon_stats_enabled(s)) { - timer_del(s->stats_timer); - timer_free(s->stats_timer); - s->stats_timer =3D NULL; + timer_del(s->stats_timer_ms); + timer_free(s->stats_timer_ms); + s->stats_timer_ms =3D NULL; s->stats_poll_interval =3D 0; } } =20 static void balloon_stats_change_timer(VirtIOBalloon *s, int64_t secs) { - timer_mod(s->stats_timer, qemu_clock_get_ms(QEMU_CLOCK_VIRTUAL) + secs= * 1000); + timer_mod(s->stats_timer_ms, + qemu_clock_get_ms(QEMU_CLOCK_VIRTUAL) + secs * 1000); } =20 static void balloon_stats_poll_cb(void *opaque) @@ -315,8 +316,9 @@ static void balloon_stats_set_poll_interval(Object *obj= , Visitor *v, } =20 /* create a new timer */ - g_assert(s->stats_timer =3D=3D NULL); - s->stats_timer =3D timer_new_ms(QEMU_CLOCK_VIRTUAL, balloon_stats_poll= _cb, s); + g_assert(s->stats_timer_ms =3D=3D NULL); + s->stats_timer_ms =3D timer_new_ms(QEMU_CLOCK_VIRTUAL, + balloon_stats_poll_cb, s); s->stats_poll_interval =3D value; balloon_stats_change_timer(s, 0); } --=20 2.21.3 From nobody Mon Feb 9 09:53:27 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1592294171; cv=none; d=zohomail.com; s=zohoarc; b=YXi6lnJxgF9ibJrxmInQIztLwlZj2bMzFp2DMwXVhn2LKOS9Iw94716xbabAMBaXh4Tf4Qn1Lq2SwB3wFAebFs1FLYJilq8KKm9vvAqFuOY70e58BPMmUVBEI4sB35fJqoHJ2o9Z14dgrIm4q6uRLFeMOO+9Hxi4jBRXFaexfU8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592294171; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=jNTvdD7mpsXZtfy12szHXck2/SJaUPu7sRItCYEvWmI=; b=PoenFP2kFcI3RqgFluGLAC0DfKxF+YWits5wKCtd2MDVHfgMXRA4AG6Qwcj7lmNDb6cTECWK8DS4E1RY8NH6+9cQ8LY+OtXvgpu/dGg2irm4ngwP5ICuxgQLSK/BTC7YkTrGYbaf+Kj5q7kAZXLZ7Mouj2dbkdbzRz/WWUHfiR4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1592294171709455.3346264984033; Tue, 16 Jun 2020 00:56:11 -0700 (PDT) Received: from localhost ([::1]:59290 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jl6S1-0002ca-HD for importer@patchew.org; Tue, 16 Jun 2020 03:56:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53946) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jl6Na-0003oP-R0; Tue, 16 Jun 2020 03:51:34 -0400 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:42173) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jl6NY-000854-Sy; Tue, 16 Jun 2020 03:51:34 -0400 Received: by mail-wr1-x441.google.com with SMTP id p5so19645032wrw.9; Tue, 16 Jun 2020 00:51:31 -0700 (PDT) Received: from localhost.localdomain (181.red-88-10-103.dynamicip.rima-tde.net. [88.10.103.181]) by smtp.gmail.com with ESMTPSA id q11sm28093538wrv.67.2020.06.16.00.51.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Jun 2020 00:51: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=jNTvdD7mpsXZtfy12szHXck2/SJaUPu7sRItCYEvWmI=; b=hlDQE2Y+qIt5bfkxo5d9ivmg+RnCdrgZik2djnVqg9fzhIrguwMe2kvyLMnFNkvBF0 fOj9yLWI3qWupCP8+4J6HdrmB6U6CcDV1+n2BP/RiO0JrA8cEh552ypE9Nl/rz/qBoJo XmMkyuNRVWUAXwAxiyexhm2kPcCDhHZRCgO2JIgEgAg1KK1jUXpeyDspzmSsRWgDMniV 8me6Zg+qkEGe1jKLfX86KnAffrKijmKYaClzj9NU4zsNReHvGBxeK+9M6DWvVHkvrhC4 XljtSuY3fqb+52RxtIOd4Piyrfumm5zdTR16RpUQkyKxrDE3P4RWFlvKvfQoRZZZOxRZ hJlw== 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=jNTvdD7mpsXZtfy12szHXck2/SJaUPu7sRItCYEvWmI=; b=lTxB+SjuF4UXWO/+qgx795nv54TIckOQiWi4PlHjbBEaoG9P+lGR86UcNhPhGsmi87 mBlzw1jO0LK9pqD7xiGQr97LlWxOvV8STF+sYQ1tkiJsjUtgu9prfVmE6qvG1GbzuCMU E4WsVqKXy9WmHFnGIDGfV733Shi9/Iho/gvyi3yx47nH1iPVyZTG8oCyikzMy/yqOXS7 mjaDFwpSFhjI8a6ooEcV/kDWXlLuubM0ABL44RUyoCjn5CPGnnpAqkmJ7idNQ/Vr/zcB 5g11RXR27WZr7FFLdAaJgnqubU4jY+LohMvUbbVM91vpT5FhfiIhyrjHCQ+mzFLASyad F7Ow== X-Gm-Message-State: AOAM5311VsAP1M7QtKc7tb8DjGov3OBakQKh3nVqAB4o5q0syBYMWUGa LuRp9VvfySRtLSkWrHr88rFVom4g X-Google-Smtp-Source: ABdhPJw+EFEn77nFC6P8FC/flCFkku6pfG6x4QObNoCxtmxUNdNMglqucXXL/xjsW6biX12wvEnnzA== X-Received: by 2002:a5d:45c2:: with SMTP id b2mr1541194wrs.323.1592293890541; Tue, 16 Jun 2020 00:51:30 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 5/7] hw/rtc/m48t59: Reduce timer precision to milli-second Date: Tue, 16 Jun 2020 09:51:19 +0200 Message-Id: <20200616075121.12837-6-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200616075121.12837-1-f4bug@amsat.org> References: <20200616075121.12837-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 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::441; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x441.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: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN 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: Kevin Wolf , Peter Maydell , qemu-block@nongnu.org, Corey Minyard , David Hildenbrand , Andrew Jeffery , "Michael S. Tsirkin" , Mark Cave-Ayland , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Max Reitz , qemu-arm@nongnu.org, Joel Stanley , Paolo Bonzini , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) The current implementation uses nano-second precision, while the RTC can not be more precise than a milli-second. Simplify by using a milli-second based timer. Rename the timer 'alrm_timer_ms' to have the unit explicit. Inspired-by: Mark Cave-Ayland Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/rtc/m48t59-internal.h | 2 +- hw/rtc/m48t59.c | 31 ++++++++++++++++--------------- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/hw/rtc/m48t59-internal.h b/hw/rtc/m48t59-internal.h index cd648241e9..f21b603f97 100644 --- a/hw/rtc/m48t59-internal.h +++ b/hw/rtc/m48t59-internal.h @@ -49,7 +49,7 @@ typedef struct M48t59State { time_t stop_time; /* Alarm & watchdog */ struct tm alarm; - QEMUTimer *alrm_timer; + QEMUTimer *alrm_timer_ms; QEMUTimer *wd_timer; /* NVRAM storage */ uint8_t *buffer; diff --git a/hw/rtc/m48t59.c b/hw/rtc/m48t59.c index 47d48054fd..d2717d00a9 100644 --- a/hw/rtc/m48t59.c +++ b/hw/rtc/m48t59.c @@ -89,7 +89,7 @@ static M48txxInfo m48txx_sysbus_info[] =3D { static void alarm_cb (void *opaque) { struct tm tm; - uint64_t next_time; + uint64_t next_time_s; M48t59State *NVRAM =3D opaque; =20 qemu_set_irq(NVRAM->IRQ, 1); @@ -104,42 +104,43 @@ static void alarm_cb (void *opaque) tm.tm_mon =3D 1; tm.tm_year++; } - next_time =3D qemu_timedate_diff(&tm) - NVRAM->time_offset; + next_time_s =3D qemu_timedate_diff(&tm) - NVRAM->time_offset; } else if ((NVRAM->buffer[0x1FF5] & 0x80) !=3D 0 && (NVRAM->buffer[0x1FF4] & 0x80) =3D=3D 0 && (NVRAM->buffer[0x1FF3] & 0x80) =3D=3D 0 && (NVRAM->buffer[0x1FF2] & 0x80) =3D=3D 0) { /* Repeat once a day */ - next_time =3D 24 * 60 * 60; + next_time_s =3D 24 * 60 * 60; } else if ((NVRAM->buffer[0x1FF5] & 0x80) !=3D 0 && (NVRAM->buffer[0x1FF4] & 0x80) !=3D 0 && (NVRAM->buffer[0x1FF3] & 0x80) =3D=3D 0 && (NVRAM->buffer[0x1FF2] & 0x80) =3D=3D 0) { /* Repeat once an hour */ - next_time =3D 60 * 60; + next_time_s =3D 60 * 60; } else if ((NVRAM->buffer[0x1FF5] & 0x80) !=3D 0 && (NVRAM->buffer[0x1FF4] & 0x80) !=3D 0 && (NVRAM->buffer[0x1FF3] & 0x80) !=3D 0 && (NVRAM->buffer[0x1FF2] & 0x80) =3D=3D 0) { /* Repeat once a minute */ - next_time =3D 60; + next_time_s =3D 60; } else { /* Repeat once a second */ - next_time =3D 1; + next_time_s =3D 1; } - timer_mod(NVRAM->alrm_timer, qemu_clock_get_ns(rtc_clock) + - next_time * 1000); + timer_mod(NVRAM->alrm_timer_ms, + qemu_clock_get_ms(rtc_clock) + next_time_s * + NANOSECONDS_PER_SECOND / SCAL= E_MS); qemu_set_irq(NVRAM->IRQ, 0); } =20 static void set_alarm(M48t59State *NVRAM) { int diff; - if (NVRAM->alrm_timer !=3D NULL) { - timer_del(NVRAM->alrm_timer); + if (NVRAM->alrm_timer_ms !=3D NULL) { + timer_del(NVRAM->alrm_timer_ms); diff =3D qemu_timedate_diff(&NVRAM->alarm) - NVRAM->time_offset; if (diff > 0) - timer_mod(NVRAM->alrm_timer, diff * 1000); + timer_mod(NVRAM->alrm_timer_ms, diff * 1000); } } =20 @@ -539,9 +540,9 @@ void m48t59_reset_common(M48t59State *NVRAM) { NVRAM->addr =3D 0; NVRAM->lock =3D 0; - if (NVRAM->alrm_timer !=3D NULL) - timer_del(NVRAM->alrm_timer); - + if (NVRAM->alrm_timer_ms !=3D NULL) { + timer_del(NVRAM->alrm_timer_ms); + } if (NVRAM->wd_timer !=3D NULL) timer_del(NVRAM->wd_timer); } @@ -603,7 +604,7 @@ void m48t59_realize_common(M48t59State *s, Error **errp) { s->buffer =3D g_malloc0(s->size); if (s->model =3D=3D 59) { - s->alrm_timer =3D timer_new_ns(rtc_clock, &alarm_cb, s); + s->alrm_timer_ms =3D timer_new_ms(rtc_clock, &alarm_cb, s); s->wd_timer =3D timer_new_ns(QEMU_CLOCK_VIRTUAL, &watchdog_cb, s); } qemu_get_timedate(&s->alarm, 0); --=20 2.21.3 From nobody Mon Feb 9 09:53:27 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1592294045; cv=none; d=zohomail.com; s=zohoarc; b=JCqdrgNO1PQ5lrj9z+EB0wgpuNPzpBHGPe6bafrxUL+a1A1IS/AaAyrtUKvpyB3B+HEi7BEBhhQM84aME1VRiK7q5OA7c4yA6Psag5SS+4CGfIRGTJI1Roob7ok5s+nQp6mK9wViQ6ijX1mBmOEiEfnYA2PwXXZainBTtrHKDuA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592294045; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=G6lKanRQH/GfdgMJk57r0dQsTnmvZD4sTSFGUEMnT+8=; b=iCsEg0NkoaTGFJhuEoVhawzcTTotAUMhYJKdMdEeBYiom2Zsr8wsFn2WxUHpVFLWkVQGf8LVzJa6pcKmdH36VJrpUziytuiWlFASWCCIcNKeTT41HrxcXXs8Yuh2dBUpk5HTabL1d4crIVk7qFZg5gdokZ9Ywe1+oJCJtV7zx4I= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 15922940450061013.268208270872; Tue, 16 Jun 2020 00:54:05 -0700 (PDT) Received: from localhost ([::1]:51852 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jl6Pz-0007yv-Oa for importer@patchew.org; Tue, 16 Jun 2020 03:54:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53952) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jl6Nb-0003qt-Nl; Tue, 16 Jun 2020 03:51:35 -0400 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:34410) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jl6Na-00085H-52; Tue, 16 Jun 2020 03:51:35 -0400 Received: by mail-wr1-x444.google.com with SMTP id r7so19698344wro.1; Tue, 16 Jun 2020 00:51:32 -0700 (PDT) Received: from localhost.localdomain (181.red-88-10-103.dynamicip.rima-tde.net. [88.10.103.181]) by smtp.gmail.com with ESMTPSA id q11sm28093538wrv.67.2020.06.16.00.51.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Jun 2020 00:51: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=G6lKanRQH/GfdgMJk57r0dQsTnmvZD4sTSFGUEMnT+8=; b=iJCnoy+jzbnpq4MspV66mcR8W9OLQyPaNrTgFvghZJew4pyRMkFpsBEsb3u9BcH9AH GUIEW2JkvqcKbEgQ8SdvGnQj/mZtUdC0vHAGwGTsolPN8xORhMaUOZtZmzbpRAWCJx2q TLo/WsF23IW78QnCbvXH3q7Z8s2V51e3mKgt65ySZ3GYvyrAmjJeD6e9U1MwdgEdF26U +AEeewBrtCA3QWFholGOv/LQP2RifuF3CsOvgaP6RZTe31MX5lSTTgtXCwdIcSeS/PgH eKHcjbaJLIv4IYE5slrX77/ICK4pzmnWkbfnarVYxe0yFGeRGnLOPMoFNuFaD0i1D6NR KF/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=G6lKanRQH/GfdgMJk57r0dQsTnmvZD4sTSFGUEMnT+8=; b=ACpopsp0oyBUPx6GAuYVEx/ayeVryUJTNIidbaD9ZBosvAdBqyVwZP1YOd3oi0SUG6 1hmtzIVzaUO30R1vGjaER+CIUDW60DQ+RdoF7fm955CmSQ/wwU+WhqnuHlbN5iKGLxil oguF1ItpBlXBbgatBmgTgpjo87ph6g9AglqQ7kxLiiCMnvyztaPqF1Lwof9KuqAr3URT tIoWkNfyG5uCGhaJk76GoICb5HCgY8IvM48DwJ4RaEAtbRB48Ym+v0HTJsC2CITrtV3E qWja0umVdPI0t3zxGZGE3scnE86wjJYWCWkQVbYckGyB8letrIxzOu7diUi6VoRiIAnq Yc8g== X-Gm-Message-State: AOAM531Nm6p9AYfOImeIty0bie2Ddg8MyiVygS22jtKOMlgO3Dpe0ocE TEY/IRSOeWsYoDxp/x0kvBiP3SlP X-Google-Smtp-Source: ABdhPJxc/ut3CrLejgtMaoW7b+CKbd6QBvEnKCkbw3lP8vJsYndJAgt+nkcsh88++Key55zlSFHmxg== X-Received: by 2002:a5d:6cc1:: with SMTP id c1mr1729297wrc.144.1592293891841; Tue, 16 Jun 2020 00:51:31 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 6/7] hw/ipmi/ipmi_bmc_extern: Reduce timer precision to milli-second Date: Tue, 16 Jun 2020 09:51:20 +0200 Message-Id: <20200616075121.12837-7-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200616075121.12837-1-f4bug@amsat.org> References: <20200616075121.12837-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 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; 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: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN 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: Kevin Wolf , Peter Maydell , qemu-block@nongnu.org, Corey Minyard , David Hildenbrand , Andrew Jeffery , "Michael S. Tsirkin" , Mark Cave-Ayland , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Max Reitz , qemu-arm@nongnu.org, Joel Stanley , Paolo Bonzini , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) The current implementation uses nano-second precision, while the device can not be more precise than a milli-second. Simplify by using a milli-second based timer. Rename the timer 'extern_timer_ms' to have the unit explicit. Inspired-by: Mark Cave-Ayland Signed-off-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/ipmi/ipmi_bmc_extern.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/hw/ipmi/ipmi_bmc_extern.c b/hw/ipmi/ipmi_bmc_extern.c index f9a13e0a44..441d3ed18e 100644 --- a/hw/ipmi/ipmi_bmc_extern.c +++ b/hw/ipmi/ipmi_bmc_extern.c @@ -81,7 +81,7 @@ typedef struct IPMIBmcExtern { unsigned int outpos; unsigned int outlen; =20 - struct QEMUTimer *extern_timer; + QEMUTimer *extern_timer_ms; =20 /* A reset event is pending to be sent upstream. */ bool send_reset; @@ -112,8 +112,8 @@ static void continue_send(IPMIBmcExtern *ibe) } if (ibe->outpos < ibe->outlen) { /* Not fully transmitted, try again in a 10ms */ - timer_mod_ns(ibe->extern_timer, - qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) + 10000000); + timer_mod(ibe->extern_timer_ms, + qemu_clock_get_ms(QEMU_CLOCK_VIRTUAL) + 10); } else { /* Sent */ ibe->outlen =3D 0; @@ -137,8 +137,8 @@ static void continue_send(IPMIBmcExtern *ibe) =20 if (ibe->waiting_rsp) { /* Make sure we get a response within 4 seconds. */ - timer_mod_ns(ibe->extern_timer, - qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) + 400000000= 0ULL); + timer_mod(ibe->extern_timer_ms, + qemu_clock_get_ms(QEMU_CLOCK_VIRTUAL) + 4 * 1000); } } return; @@ -303,7 +303,7 @@ static void handle_msg(IPMIBmcExtern *ibe) ibe->inpos--; /* Remove checkum */ } =20 - timer_del(ibe->extern_timer); + timer_del(ibe->extern_timer_ms); ibe->waiting_rsp =3D false; k->handle_rsp(ibe->parent.intf, ibe->inbuf[0], ibe->inbuf + 1, ibe->in= pos - 1); } @@ -502,7 +502,8 @@ static void ipmi_bmc_extern_init(Object *obj) { IPMIBmcExtern *ibe =3D IPMI_BMC_EXTERN(obj); =20 - ibe->extern_timer =3D timer_new_ns(QEMU_CLOCK_VIRTUAL, extern_timeout,= ibe); + ibe->extern_timer_ms =3D timer_new_ms(QEMU_CLOCK_VIRTUAL, + extern_timeout, ibe); vmstate_register(NULL, 0, &vmstate_ipmi_bmc_extern, ibe); } =20 @@ -510,8 +511,8 @@ static void ipmi_bmc_extern_finalize(Object *obj) { IPMIBmcExtern *ibe =3D IPMI_BMC_EXTERN(obj); =20 - timer_del(ibe->extern_timer); - timer_free(ibe->extern_timer); + timer_del(ibe->extern_timer_ms); + timer_free(ibe->extern_timer_ms); } =20 static Property ipmi_bmc_extern_properties[] =3D { --=20 2.21.3 From nobody Mon Feb 9 09:53:27 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1592294210; cv=none; d=zohomail.com; s=zohoarc; b=DzNzWoBqLHZdrbyJkh6BlvLQn5WXLoiPDSCbDjEw2ACoBLr/ZXpbJfiZtH8dk7V/iL75nVTXnK+RirI2sEqI+9iBNfIlUCLlxaRYlZY3rDezkI6qDS9t7PnZp6FTLo2RGk0/3aawML1enf2l3J/TKxyLj7CLqP1Y8V6VMZVtSPI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592294210; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=X3NztLovGUVeCGZNLiGLjBwKDBV+Pcr5uGZxcvfdmrY=; b=aA2fHWMCdD+L8Neow1Rkh20DEXINplUx5UALzqoL3q/xTdpcCeJN8HxiHG0YRQ26fHYtT8/uHyQOJi7rsVLkj4R47eWDuHG5LDvouuywjiSRRT9MvyXtJ19u8yq/SZcdl9JBGoMUkUyGeEdoswrcU/SjFHm0QuHptFlZyR3tW9w= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 159229421023655.259713831201566; Tue, 16 Jun 2020 00:56:50 -0700 (PDT) Received: from localhost ([::1]:32962 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jl6Se-0003QM-E5 for importer@patchew.org; Tue, 16 Jun 2020 03:56:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53970) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jl6Nd-0003vA-G3; Tue, 16 Jun 2020 03:51:37 -0400 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]:53330) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jl6Nb-00085b-QF; Tue, 16 Jun 2020 03:51:37 -0400 Received: by mail-wm1-x341.google.com with SMTP id l26so1885756wme.3; Tue, 16 Jun 2020 00:51:34 -0700 (PDT) Received: from localhost.localdomain (181.red-88-10-103.dynamicip.rima-tde.net. [88.10.103.181]) by smtp.gmail.com with ESMTPSA id q11sm28093538wrv.67.2020.06.16.00.51.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Jun 2020 00:51:32 -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=X3NztLovGUVeCGZNLiGLjBwKDBV+Pcr5uGZxcvfdmrY=; b=rPb8ee+wygtZWv4ygAuZYdSrKydWCvSuCb2dTCvULgmJzad8a0TbldC89qG9uf4JbC IjcwTVD1vhTXOW8n4HN+L5iD1mGoUnb/1wUPgp2Y7k3plqS3LuSTm0Aw2mvgbNJcsL4c tNE/S8cNqtfmtyLbAzO4A26zkPLMNz1PMcjOyHSaib/prrJoTTAoSSBYvfpMcSzVxcHY wWynZU6bQnEu4NKpxHf1SqJhWyDQlKsfxidcRT6y+PSU3UxaoK9FPCQtR7iYL+RENdlJ jsIHMDeaCnHcwuqx/IRhM3hV72MjcUVnzEsqkiDOaLOg8rLVYoZ7BIhIYkkICVD8VD1I WB1w== 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=X3NztLovGUVeCGZNLiGLjBwKDBV+Pcr5uGZxcvfdmrY=; b=dJdYX+J6gbv48XzwRZKiNvf1cJWJwYC3zLOVjQFmGGPS0Njyx2MfxAXUyJ53TOtX0R b9wkkceGglwVbR7or2o/DwNxI2v8yr+PFyQiefCO6ifMFNTQGmftwUkvvP+wNfgllpmK PSW3DZb+/+Wt5KTJ178USz7EsIlFxZa51llKRYF9t4BrT2H5sOzwxWHJObML92Fn0AJN xtM+a2jfa8DpaLtFIVw2h5lHMFDvu8eiMj8Z/e4oqSLqyCtx5eIRPVNAh0VWwH0wYjn3 0qZTm9XPn2/XVpifzs67+MULO9wuuPUvh/96j21md01PYB4Fln/oW6hCRTj37srlIfy5 GvCA== X-Gm-Message-State: AOAM530V9Dgp2oIVaaQYe/ehjFLHJMIlZjadhjVUlnoMq0aRnUNTrnFF rmOo22XBSnf8XWtDnogM/u3/g9Ms X-Google-Smtp-Source: ABdhPJwyjF/RrvQsrN0MqAM1aFul+xxvjuBzkYqzsi5XzjFtVcwXmUJh7yXZLz/5si/8HT4f5CLlGQ== X-Received: by 2002:a05:600c:21d3:: with SMTP id x19mr1967406wmj.137.1592293893404; Tue, 16 Jun 2020 00:51:33 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 7/7] hw/watchdog/wdt_aspeed: Reduce timer precision to micro-second Date: Tue, 16 Jun 2020 09:51:21 +0200 Message-Id: <20200616075121.12837-8-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200616075121.12837-1-f4bug@amsat.org> References: <20200616075121.12837-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 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::341; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-x341.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: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN 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: Kevin Wolf , Peter Maydell , qemu-block@nongnu.org, Corey Minyard , David Hildenbrand , Andrew Jeffery , "Michael S. Tsirkin" , Mark Cave-Ayland , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Max Reitz , qemu-arm@nongnu.org, Joel Stanley , Paolo Bonzini , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) The current implementation uses nano-second precision, while the watchdog can not be more precise than a micro-second. Simplify by using a micro-second based timer. Rename the timer 'timer_us' to have the unit explicit. Inspired-by: Mark Cave-Ayland Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/watchdog/wdt_aspeed.h | 2 +- hw/watchdog/wdt_aspeed.c | 24 +++++++++++++----------- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/include/hw/watchdog/wdt_aspeed.h b/include/hw/watchdog/wdt_asp= eed.h index 819c22993a..e76a493788 100644 --- a/include/hw/watchdog/wdt_aspeed.h +++ b/include/hw/watchdog/wdt_aspeed.h @@ -25,7 +25,7 @@ typedef struct AspeedWDTState { /*< private >*/ SysBusDevice parent_obj; - QEMUTimer *timer; + QEMUTimer *timer_us; =20 /*< public >*/ MemoryRegion iomem; diff --git a/hw/watchdog/wdt_aspeed.c b/hw/watchdog/wdt_aspeed.c index 6352ba1b0e..3fcb20f72b 100644 --- a/hw/watchdog/wdt_aspeed.c +++ b/hw/watchdog/wdt_aspeed.c @@ -98,23 +98,24 @@ static void aspeed_wdt_reload(AspeedWDTState *s) uint64_t reload; =20 if (!(s->regs[WDT_CTRL] & WDT_CTRL_1MHZ_CLK)) { - reload =3D muldiv64(s->regs[WDT_RELOAD_VALUE], NANOSECONDS_PER_SEC= OND, + reload =3D muldiv64(s->regs[WDT_RELOAD_VALUE], + NANOSECONDS_PER_SECOND / SCALE_US, s->pclk_freq); } else { - reload =3D s->regs[WDT_RELOAD_VALUE] * 1000ULL; + reload =3D s->regs[WDT_RELOAD_VALUE]; } =20 if (aspeed_wdt_is_enabled(s)) { - timer_mod(s->timer, qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) + reload= ); + timer_mod(s->timer_us, qemu_clock_get_us(QEMU_CLOCK_VIRTUAL) + rel= oad); } } =20 static void aspeed_wdt_reload_1mhz(AspeedWDTState *s) { - uint64_t reload =3D s->regs[WDT_RELOAD_VALUE] * 1000ULL; + uint64_t reload =3D s->regs[WDT_RELOAD_VALUE]; =20 if (aspeed_wdt_is_enabled(s)) { - timer_mod(s->timer, qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) + reload= ); + timer_mod(s->timer_us, qemu_clock_get_us(QEMU_CLOCK_VIRTUAL) + rel= oad); } } =20 @@ -149,7 +150,7 @@ static void aspeed_wdt_write(void *opaque, hwaddr offse= t, uint64_t data, awc->wdt_reload(s); } else if (!enable && aspeed_wdt_is_enabled(s)) { s->regs[WDT_CTRL] =3D data; - timer_del(s->timer); + timer_del(s->timer_us); } break; case WDT_RESET_WIDTH: @@ -189,7 +190,7 @@ static const VMStateDescription vmstate_aspeed_wdt =3D { .version_id =3D 0, .minimum_version_id =3D 0, .fields =3D (VMStateField[]) { - VMSTATE_TIMER_PTR(timer, AspeedWDTState), + VMSTATE_TIMER_PTR(timer_us, AspeedWDTState), VMSTATE_UINT32_ARRAY(regs, AspeedWDTState, ASPEED_WDT_REGS_MAX), VMSTATE_END_OF_LIST() } @@ -214,7 +215,7 @@ static void aspeed_wdt_reset(DeviceState *dev) s->regs[WDT_CTRL] =3D 0; s->regs[WDT_RESET_WIDTH] =3D 0xFF; =20 - timer_del(s->timer); + timer_del(s->timer_us); } =20 static void aspeed_wdt_timer_expired(void *dev) @@ -224,7 +225,7 @@ static void aspeed_wdt_timer_expired(void *dev) =20 /* Do not reset on SDRAM controller reset */ if (s->scu->regs[reset_ctrl_reg] & SCU_RESET_SDRAM) { - timer_del(s->timer); + timer_del(s->timer_us); s->regs[WDT_CTRL] =3D 0; return; } @@ -232,7 +233,7 @@ static void aspeed_wdt_timer_expired(void *dev) qemu_log_mask(CPU_LOG_RESET, "Watchdog timer %" HWADDR_PRIx " expired.= \n", s->iomem.addr); watchdog_perform_action(); - timer_del(s->timer); + timer_del(s->timer_us); } =20 #define PCLK_HZ 24000000 @@ -244,7 +245,8 @@ static void aspeed_wdt_realize(DeviceState *dev, Error = **errp) =20 assert(s->scu); =20 - s->timer =3D timer_new_ns(QEMU_CLOCK_VIRTUAL, aspeed_wdt_timer_expired= , dev); + s->timer_us =3D timer_new_us(QEMU_CLOCK_VIRTUAL, + aspeed_wdt_timer_expired, dev); =20 /* FIXME: This setting should be derived from the SCU hw strapping * register SCU70 --=20 2.21.3