From nobody Sat May 10 07:31:26 2025
Delivered-To: importer@patchew.org
Authentication-Results: mx.zohomail.com;
dkim=pass;
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=pass(p=none dis=none) header.from=linaro.org
ARC-Seal: i=1; a=rsa-sha256; t=1733512344; cv=none;
d=zohomail.com; s=zohoarc;
b=LRvjlcTP9NEUmf7hQcEDNl2tv1JVRzeI69deP+tWfj++RszRpoyLKkWZQEugJEmHOQCzw5QoXVm4vXNVvCO3g40haoPPztSMBTAEltE1gxN7ZVqgFxSaAoJKMadEZksKrfdp4u3U+Ku7tvtXlYV8WKXN7muI1GHifWfUpB9RRY8=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
s=zohoarc;
t=1733512344;
h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To;
bh=YgcNNQUYfz24Ofcaa3/V/dRBkc53lWEecigpnwJFnlA=;
b=gWSQ8H0iDUn0vlHNeTTnN+e5FRY9dyT56LPHU4p46sIuD62IbTDYo+RMoYyRVvfXRPnbSASc6chL03N5whCqDNsEZGys1i8ggiqnlib1vlIVhU59MuO09HTn71MwgYcVd76pGlx94OtFp0751tVg7on57hi0TcGKxcipodau4uI=
ARC-Authentication-Results: i=1; mx.zohomail.com;
dkim=pass;
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=pass header.from=<philmd@linaro.org> (p=none dis=none)
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
mx.zohomail.com
with SMTPS id 1733512344888334.1570586578905;
Fri, 6 Dec 2024 11:12:24 -0800 (PST)
Received: from localhost ([::1] helo=lists1p.gnu.org)
by lists.gnu.org with esmtp (Exim 4.90_1)
(envelope-from <qemu-devel-bounces@nongnu.org>)
id 1tJdjp-0005uG-NR; Fri, 06 Dec 2024 14:11:41 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10])
by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <philmd@linaro.org>) id 1tJdjo-0005tu-77
for qemu-devel@nongnu.org; Fri, 06 Dec 2024 14:11:40 -0500
Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.90_1) (envelope-from <philmd@linaro.org>) id 1tJdjm-0001dz-Mt
for qemu-devel@nongnu.org; Fri, 06 Dec 2024 14:11:39 -0500
Received: by mail-wm1-x32c.google.com with SMTP id
5b1f17b1804b1-434a83c6b01so16450605e9.0
for <qemu-devel@nongnu.org>; Fri, 06 Dec 2024 11:11:38 -0800 (PST)
Received: from localhost.localdomain ([95.127.41.180])
by smtp.gmail.com with ESMTPSA id
5b1f17b1804b1-434da0d26b0sm66778295e9.9.2024.12.06.11.11.33
(version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256);
Fri, 06 Dec 2024 11:11:35 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=linaro.org; s=google; t=1733512297; x=1734117097; darn=nongnu.org;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:from:to:cc:subject:date
:message-id:reply-to;
bh=YgcNNQUYfz24Ofcaa3/V/dRBkc53lWEecigpnwJFnlA=;
b=dCdvq1DM0BTfnWliKjfgqLw7lJZmwV4sHC5KQy1OhGGCbJlEw7BbMdl+PeOtcHpBpb
/9pyyuOjVmNI/MTAzmgw8oTDJy56oKHdZikt3NGB7qw65vyWA3kbh0hhoVw4XF74JfWN
GEV8v2fZ0hs0/nUONKqTz2uA47n3Pehj8Wkf+jGXyVlFsS50k7gIaLqYcM4h7krh1rQS
6hotQNpf59TCdUmfEHlzQoY/vhvpdUOzBmJ23vSjrCYWv9SRj9gT6kwOmUslcGJcK6Dz
zicDySbniUB3nxt/5sNp9rq+UStcBKtGdXbUMVJn18nei7yh8R/Jx6WR1Gu4lRHQ5ujv
rnEw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1733512297; x=1734117097;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc
:subject:date:message-id:reply-to;
bh=YgcNNQUYfz24Ofcaa3/V/dRBkc53lWEecigpnwJFnlA=;
b=XnO5nCwUQSB1SzKL5Il7btRsnja1Fno7pI/9M4/FFRWJ/CqtNNNoSDgRKEQbgzL4d5
NXwWtaDKIhE64a2vQJuPTEn5E5VmwhnR7e/KJvuKJhs71EjT94CGNR8+ILB0Cbv5y5KV
Jw7/lIjsPGi10lIuSM83+XWUrkPOXgtp/k82Z06QRYNjJf/MF2bdCmJHZmfIg0sRnXDU
5IB33VXHzhYKyqBZbOQE1bapLmL0zIlhgfE8jWXh9hkVmQHMwDazv133nsokNXCJ+aYU
/lF3LowDpQP4pCYjE9VB7LIxiSuFRPwsjCSUZh7mq1PcuEJb0AyqsjkenJj/ZVag3rqF
im5w==
X-Gm-Message-State: AOJu0YzbLMQTa+PDpxO04bbQbs6MvvbSvYbeBsAeAkb6Z0OAPtWFdoiH
wmtEBWiRA1xM3//ruYfxcfTpWWzrPIphjg3TRflxcuYjMQRnAg0I3efQcDW56sWvHI3qHy48L6d
tNsQ=
X-Gm-Gg: ASbGncu1OnzDdKMMPx6gbrHqgqr/cfBlt+ilE3X1829ndxaasQHHBP3pBqHhNU2DEko
BRtRZ6FS6Na1dhDsiARZOw3TcDGTBHioCCQ+vdVHaapWpIgXcV+UpLiC3droGjx6iE05/UsnUgM
IEpbTX8t8hgk5C9CaGgCKp6E+r4XF41C131NibroLZPcEH32947x2aqjVWKqidU5Fzd8Y0Mjs32
kzftEDKIE8T1AQFAltQ737JxdIV9hPUXQ0+K1lsaGKBWYuC+GTi+tYgDD9YKvkuIDw=
X-Google-Smtp-Source:
AGHT+IHa08sSewuMjolYRRvxoGBAWXes5IaEwzPvDvpZBiW6JqK2fOLRR9cgeRSC6IKhe9NcSH1EKA==
X-Received: by 2002:a05:6000:1846:b0:385:e8b0:df13 with SMTP id
ffacd0b85a97d-3862b3d5c9amr3188655f8f.40.1733512296763;
Fri, 06 Dec 2024 11:11:36 -0800 (PST)
From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Michael S. Tsirkin" <mst@redhat.com>,
Richard Henderson <richard.henderson@linaro.org>,
Eduardo Habkost <eduardo@habkost.net>,
Marcel Apfelbaum <marcel.apfelbaum@gmail.com>,
Zhao Liu <zhao1.liu@intel.com>, Paolo Bonzini <pbonzini@redhat.com>,
=?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@linaro.org>
Subject: [PATCH 1/4] hw/timer/hpet: Introduce hpet_add_fw_cfg_bytes()
Date: Fri, 6 Dec 2024 20:11:21 +0100
Message-ID: <20241206191124.9195-2-philmd@linaro.org>
X-Mailer: git-send-email 2.45.2
In-Reply-To: <20241206191124.9195-1-philmd@linaro.org>
References: <20241206191124.9195-1-philmd@linaro.org>
MIME-Version: 1.0
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::32c;
envelope-from=philmd@linaro.org; helo=mail-wm1-x32c.google.com
X-Spam_score_int: -20
X-Spam_score: -2.1
X-Spam_bar: --
X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,
DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,
RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001,
SPF_PASS=-0.001 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-BeenThere: qemu-devel@nongnu.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org
X-ZohoMail-DKIM: pass (identity @linaro.org)
X-ZM-MESSAGEID: 1733512347045116600
Introduce hpet_add_fw_cfg_bytes() to restrict accesses
to hpet_cfg[] within hw/timer/hpet.c.
Signed-off-by: Philippe Mathieu-Daud=C3=A9 <philmd@linaro.org>
---
include/hw/timer/hpet.h | 2 ++
hw/i386/fw_cfg.c | 5 ++---
hw/timer/hpet.c | 10 ++++++++++
3 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/include/hw/timer/hpet.h b/include/hw/timer/hpet.h
index d17a8d43199..d361ab9e931 100644
--- a/include/hw/timer/hpet.h
+++ b/include/hw/timer/hpet.h
@@ -85,4 +85,6 @@ static inline bool hpet_find(void)
return object_resolve_path_type("", TYPE_HPET, NULL);
}
=20
+bool hpet_add_fw_cfg_bytes(FWCfgState *fw_cfg, Error **errp);
+
#endif
diff --git a/hw/i386/fw_cfg.c b/hw/i386/fw_cfg.c
index 0e4494627c2..16f806e76b1 100644
--- a/hw/i386/fw_cfg.c
+++ b/hw/i386/fw_cfg.c
@@ -26,8 +26,6 @@
#include CONFIG_DEVICES
#include "target/i386/cpu.h"
=20
-struct hpet_fw_config hpet_cfg =3D {.count =3D UINT8_MAX};
-
const char *fw_cfg_arch_key_name(uint16_t key)
{
static const struct {
@@ -149,7 +147,8 @@ FWCfgState *fw_cfg_arch_create(MachineState *ms,
#endif
fw_cfg_add_i32(fw_cfg, FW_CFG_IRQ0_OVERRIDE, 1);
=20
- fw_cfg_add_bytes(fw_cfg, FW_CFG_HPET, &hpet_cfg, sizeof(hpet_cfg));
+ hpet_add_fw_cfg_bytes(fw_cfg, &error_fatal);
+
/* allocate memory for the NUMA channel: one (64bit) word for the numb=
er
* of nodes, one word for each VCPU->node and one word for each node to
* hold the amount of memory.
diff --git a/hw/timer/hpet.c b/hw/timer/hpet.c
index 5399f1b2a3f..9ca1424565f 100644
--- a/hw/timer/hpet.c
+++ b/hw/timer/hpet.c
@@ -36,6 +36,7 @@
#include "hw/rtc/mc146818rtc_regs.h"
#include "migration/vmstate.h"
#include "hw/timer/i8254.h"
+#include "hw/i386/fw_cfg.h"
#include "exec/address-spaces.h"
#include "qom/object.h"
#include "trace.h"
@@ -86,6 +87,8 @@ struct HPETState {
uint8_t hpet_id; /* instance id */
};
=20
+struct hpet_fw_config hpet_cfg =3D {.count =3D UINT8_MAX};
+
static uint32_t hpet_in_legacy_mode(HPETState *s)
{
return s->config & HPET_CFG_LEGACY;
@@ -777,3 +780,10 @@ static void hpet_register_types(void)
}
=20
type_init(hpet_register_types)
+
+bool hpet_add_fw_cfg_bytes(FWCfgState *fw_cfg, Error **errp)
+{
+ fw_cfg_add_bytes(fw_cfg, FW_CFG_HPET, &hpet_cfg, sizeof(hpet_cfg));
+
+ return true;
+}
--=20
2.45.2
From nobody Sat May 10 07:31:26 2025
Delivered-To: importer@patchew.org
Authentication-Results: mx.zohomail.com;
dkim=pass;
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=pass(p=none dis=none) header.from=linaro.org
ARC-Seal: i=1; a=rsa-sha256; t=1733512389; cv=none;
d=zohomail.com; s=zohoarc;
b=RsHWfMc/+LADO6b5lr+XGvuz9MS6aL6rJUVk6iM90VA7D6l/8ybDtmbkjhA8eYxMajtP4nycS1RqZYieShPk1p7LTF80exT+8g26UGcp61gW3n3qyOyJhxvjIXHOek9dwA42q9kWRmc+vhPSgZWsPP8wdmPHp2H9rVg3qFvqhTk=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
s=zohoarc;
t=1733512389;
h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To;
bh=inpxKK/bSOw7wpkiYaFHlIXdNffEZkImnMWDkwESKJk=;
b=Ekm5aCXXTh0Rk0QdwtFHbXSVDfxHhhyQj2qWV6JRBJnQPgN5ZjVvdjw5JUlqIhneLDaqqF3j3KikkThS/azKATNlRhJqUYM4ZAasTpBYoSF2yw+l9WUJhs26lkUo0bHGl29JvZuhCt1kHVTWsAJ/or6bujrUvTKVCeN4mVEgU4w=
ARC-Authentication-Results: i=1; mx.zohomail.com;
dkim=pass;
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=pass header.from=<philmd@linaro.org> (p=none dis=none)
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
mx.zohomail.com
with SMTPS id 1733512389603220.14508667393397;
Fri, 6 Dec 2024 11:13:09 -0800 (PST)
Received: from localhost ([::1] helo=lists1p.gnu.org)
by lists.gnu.org with esmtp (Exim 4.90_1)
(envelope-from <qemu-devel-bounces@nongnu.org>)
id 1tJdjy-0005vD-1Q; Fri, 06 Dec 2024 14:11:50 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10])
by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <philmd@linaro.org>) id 1tJdjv-0005ut-7P
for qemu-devel@nongnu.org; Fri, 06 Dec 2024 14:11:47 -0500
Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.90_1) (envelope-from <philmd@linaro.org>) id 1tJdjt-0001ea-M9
for qemu-devel@nongnu.org; Fri, 06 Dec 2024 14:11:46 -0500
Received: by mail-wm1-x332.google.com with SMTP id
5b1f17b1804b1-434aafd68e9so17027245e9.0
for <qemu-devel@nongnu.org>; Fri, 06 Dec 2024 11:11:45 -0800 (PST)
Received: from localhost.localdomain ([95.127.41.180])
by smtp.gmail.com with ESMTPSA id
5b1f17b1804b1-434d526b312sm104463915e9.6.2024.12.06.11.11.41
(version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256);
Fri, 06 Dec 2024 11:11:43 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=linaro.org; s=google; t=1733512304; x=1734117104; darn=nongnu.org;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:from:to:cc:subject:date
:message-id:reply-to;
bh=inpxKK/bSOw7wpkiYaFHlIXdNffEZkImnMWDkwESKJk=;
b=OwemHclZSo9xwe1p0E0SEKFPyoaMRjsFhrQkJmkPDK+rhR0m/0Jfhws960RfCd8pnx
/u7M3/JOhg0Q6z0tzigyRpXzdXi9BWZXgdKIT951YiPnSMgsUnin36QoisOd1IMwCXlA
BXqs9U1kE/b7K/XTez4YQkn2zyG5tkzTot85W4Hf+yrHY6VDABD+oT1y61aRwId+egjL
BELriPNNFei7cCvWSdNFfFp7uPbVgY/8WsJ0g4gxECXokFJrfOKT7CfoFIMpual6aDsU
C0oF2jOvW00f7p7ebRkclZr5RnVZc/7lCJyhckeTbrffHnTwzXUlmwpSgFV5UafmMdKb
/X7A==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1733512304; x=1734117104;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc
:subject:date:message-id:reply-to;
bh=inpxKK/bSOw7wpkiYaFHlIXdNffEZkImnMWDkwESKJk=;
b=ZpzaH2OcQZ2OKlcZIACMlyylbjOp/jcFTBflP4G2VjKrfrHHJTOj62OIZT8/W5x9Ed
BmyaELyfyaEQNj/pY77zCeoN50S6x38w4p5Ay/vvhol+eAy6GTnRH8Xl9oeshveTFpb+
mUs4+glzPbtJzqO/yTzvKzfWCurO4GydDGA0CLkneGJJEKL+SDuZrNjq9ZR1SX5dGuy/
wg19iW2tsEbnOeJ/Z6cE5ohueskqTXSS680zKCoF++rpI72XaFAXSupG6akb0kczl9No
T3fivP/hffQcYV0pPgo/hv6BTB+DnJQzWV+bfftEUrnTrAR+yUtbo0ReNHlKA7KPlMi/
cUTQ==
X-Gm-Message-State: AOJu0Yz2aZqzMXxAzjtw4giDC7B2EsAG/ABBerPlOpqD+qXY/kJnYHi+
11eXN8gJnRyAKJuVlb7/U6rueWNaSLQc0KOVhvkpEmQObTnVLXoieMeXFvO82nIwmYhx2OOmGml
HfbY=
X-Gm-Gg: ASbGncuoZW+hyDkgce7NJV+Jwg99An7AWoYUKzQP9HXBbQTQbdCEobpTYlxao+WNrFm
su+YNavz0rmDrU94yM4XE2qL6eKDJW1Mg1YOHdfC10BpMSJAwoh3RYy3TMGr7VLeX4yg0T58ORv
KiztGOIaiYmopCoATq0kyFSLKJ80zz9Yk+GTjl5/+6roIuiwrqI6WNtG0H0ZjylPWtzu101fSZl
E7IIodEes343OXXev//sK6SC2CiXBHYOrRtulj5nEiyRkoCVAo5k0fY80wvw6Ko9Mc=
X-Google-Smtp-Source:
AGHT+IGZmG/pNmhqQC9Zl2YduQckfG9RFydzk6yGsvB17dGx/q9JXAqRNMGrQFYjvCi62acFg/oWfg==
X-Received: by 2002:a05:600c:4eca:b0:431:6060:8b16 with SMTP id
5b1f17b1804b1-434ddedbb3bmr43086355e9.30.1733512303951;
Fri, 06 Dec 2024 11:11:43 -0800 (PST)
From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Michael S. Tsirkin" <mst@redhat.com>,
Richard Henderson <richard.henderson@linaro.org>,
Eduardo Habkost <eduardo@habkost.net>,
Marcel Apfelbaum <marcel.apfelbaum@gmail.com>,
Zhao Liu <zhao1.liu@intel.com>, Paolo Bonzini <pbonzini@redhat.com>,
=?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@linaro.org>
Subject: [PATCH 2/4] hw/timer/hpet: Reduce hpet_cfg[] scope
Date: Fri, 6 Dec 2024 20:11:22 +0100
Message-ID: <20241206191124.9195-3-philmd@linaro.org>
X-Mailer: git-send-email 2.45.2
In-Reply-To: <20241206191124.9195-1-philmd@linaro.org>
References: <20241206191124.9195-1-philmd@linaro.org>
MIME-Version: 1.0
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::332;
envelope-from=philmd@linaro.org; helo=mail-wm1-x332.google.com
X-Spam_score_int: -20
X-Spam_score: -2.1
X-Spam_bar: --
X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,
DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,
RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001,
SPF_PASS=-0.001 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-BeenThere: qemu-devel@nongnu.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org
X-ZohoMail-DKIM: pass (identity @linaro.org)
X-ZM-MESSAGEID: 1733512391093116600
Now than hpet_cfg[] is only accessed within hpet.c, make
it static. No need to expose the hpet_fw_entry/hpet_fw_config
structure declarations outside of it, so move them in the
source too.
Signed-off-by: Philippe Mathieu-Daud=C3=A9 <philmd@linaro.org>
---
include/hw/timer/hpet.h | 16 ----------------
hw/timer/hpet.c | 16 +++++++++++++++-
2 files changed, 15 insertions(+), 17 deletions(-)
diff --git a/include/hw/timer/hpet.h b/include/hw/timer/hpet.h
index d361ab9e931..2a95799a679 100644
--- a/include/hw/timer/hpet.h
+++ b/include/hw/timer/hpet.h
@@ -60,22 +60,6 @@
#define HPET_TN_INT_ROUTE_CAP_SHIFT 32
#define HPET_TN_CFG_BITS_READONLY_OR_RESERVED 0xffff80b1U
=20
-struct hpet_fw_entry
-{
- uint32_t event_timer_block_id;
- uint64_t address;
- uint16_t min_tick;
- uint8_t page_prot;
-} QEMU_PACKED;
-
-struct hpet_fw_config
-{
- uint8_t count;
- struct hpet_fw_entry hpet[8];
-} QEMU_PACKED;
-
-extern struct hpet_fw_config hpet_cfg;
-
#define TYPE_HPET "hpet"
=20
#define HPET_INTCAP "hpet-intcap"
diff --git a/hw/timer/hpet.c b/hw/timer/hpet.c
index 9ca1424565f..849cb3e669b 100644
--- a/hw/timer/hpet.c
+++ b/hw/timer/hpet.c
@@ -41,6 +41,20 @@
#include "qom/object.h"
#include "trace.h"
=20
+struct hpet_fw_entry
+{
+ uint32_t event_timer_block_id;
+ uint64_t address;
+ uint16_t min_tick;
+ uint8_t page_prot;
+} QEMU_PACKED;
+
+struct hpet_fw_config
+{
+ uint8_t count;
+ struct hpet_fw_entry hpet[8];
+} QEMU_PACKED;
+
#define HPET_MSI_SUPPORT 0
=20
OBJECT_DECLARE_SIMPLE_TYPE(HPETState, HPET)
@@ -87,7 +101,7 @@ struct HPETState {
uint8_t hpet_id; /* instance id */
};
=20
-struct hpet_fw_config hpet_cfg =3D {.count =3D UINT8_MAX};
+static struct hpet_fw_config hpet_cfg =3D {.count =3D UINT8_MAX};
=20
static uint32_t hpet_in_legacy_mode(HPETState *s)
{
--=20
2.45.2
From nobody Sat May 10 07:31:26 2025
Delivered-To: importer@patchew.org
Authentication-Results: mx.zohomail.com;
dkim=pass;
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=pass(p=none dis=none) header.from=linaro.org
ARC-Seal: i=1; a=rsa-sha256; t=1733512377; cv=none;
d=zohomail.com; s=zohoarc;
b=MOqILdC1/16PhSNWWnqaTwJIpWxrJLY8kRARKOqBAV+Qw6kESByK4pOcoa0kiSaGvKeziyzL/rQbmgXusXspyH+4jAOihiHRFUi+ktlDxwUDXkmoDJkK6S5wavqJOYCAcOKLg56pZTLLV6PmlxAP8cbamzKMVGG+kFeGrn8FOdA=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
s=zohoarc;
t=1733512377;
h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To;
bh=Dd/n06KQPsRfxFeQobyHwXgQczMYXIkFQbqkcOigBrk=;
b=LdhSqkuRFy1sf/FAnrrpJyZqF1LO1fZgP76+WmGSZlP0q7BejCFs2ifwMyePNusHj0qzYYTsAA2jG0XjH58OmhtFEjXdT/BaR62JFqSopBi8zeuwKSTCyliwmiDwfEYTtmkd4duUfBTPykc+1LDYZ77NCqyzHvCd76lQucZD3Uc=
ARC-Authentication-Results: i=1; mx.zohomail.com;
dkim=pass;
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=pass header.from=<philmd@linaro.org> (p=none dis=none)
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
mx.zohomail.com
with SMTPS id 1733512377154591.5862101370797;
Fri, 6 Dec 2024 11:12:57 -0800 (PST)
Received: from localhost ([::1] helo=lists1p.gnu.org)
by lists.gnu.org with esmtp (Exim 4.90_1)
(envelope-from <qemu-devel-bounces@nongnu.org>)
id 1tJdk4-0005wY-2U; Fri, 06 Dec 2024 14:11:56 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10])
by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <philmd@linaro.org>) id 1tJdk2-0005w9-TT
for qemu-devel@nongnu.org; Fri, 06 Dec 2024 14:11:54 -0500
Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.90_1) (envelope-from <philmd@linaro.org>) id 1tJdk1-0001f7-DN
for qemu-devel@nongnu.org; Fri, 06 Dec 2024 14:11:54 -0500
Received: by mail-wm1-x333.google.com with SMTP id
5b1f17b1804b1-434a2033562so22877105e9.1
for <qemu-devel@nongnu.org>; Fri, 06 Dec 2024 11:11:53 -0800 (PST)
Received: from localhost.localdomain ([95.127.41.180])
by smtp.gmail.com with ESMTPSA id
5b1f17b1804b1-434d5281229sm102098015e9.26.2024.12.06.11.11.48
(version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256);
Fri, 06 Dec 2024 11:11:51 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=linaro.org; s=google; t=1733512311; x=1734117111; darn=nongnu.org;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:from:to:cc:subject:date
:message-id:reply-to;
bh=Dd/n06KQPsRfxFeQobyHwXgQczMYXIkFQbqkcOigBrk=;
b=yB6I9kHDEnNlOQhz6Q+ukyMhfwXLMeS19PZGJ5DP18qSxy2L2ovtPp13XuD7ekWujf
5Z9GaOuIT2LK0Pk+k8fVFKY0hJXer7PH+XcpKlUXO3dMLwoVvBRXsGgAnQ/UD3eabufC
P+Lo2pvwMC4qzdXl+mPmmIzDSzEW55IjHvNbA52tFf2kfEcnNVHOwSUH34ifOjp+JCmv
4B25V0LINBDLfLr/zqo24c7+0K53edCCZ0dXUDWmWTxH/54iiZng/1DSi4eO4HGtSNYj
2O618ac7cPgUbFg6NqUFfg8KhhRroiY0itL1HJYM1dS41JgScaMm5JfuZ1KaAoL2ZSOR
SUSg==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1733512311; x=1734117111;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc
:subject:date:message-id:reply-to;
bh=Dd/n06KQPsRfxFeQobyHwXgQczMYXIkFQbqkcOigBrk=;
b=VyT9poYYusMynkHhrpTxr5UYFiYx6j2O9JlKZPp4QLMjS/d+8oJjriqMNDFr9ku/RQ
3hqcmYJow2Zf3BNN7QuBgL5n8Lfv0obdxpoEIRGFZsQ4Himky1G7VxD6ZslnH79R5k6P
nB2y0+NntQoXmnTKM+KyqhZb/i8024wgdHOyG6T0TeBrg8nhRI7X4bxI3kT7S6IRhbxm
cPwCZ3MlykAQt/djO7Oivvoa6LxmAhi/mOp6ZkXaMkiZlXwG9zN73oeE8EAtGlH7qSID
1PofwIJlBk2I4LETM2uZqMpd7QKWpb1ilEffMyl6w3nN5Z6lJRrwhIzL+u6ZpsP31j4C
2k8w==
X-Gm-Message-State: AOJu0YxiKVcrtOKiXosAv88Li03/O00VXd3288PPTa2tFim3rKKXlM3l
pJasJNMgOP0kFz44Qe4FKtEWNd7QsYx5czkS0HIv1iU5XZMFF8OYqIkItbr55MxPtrKtTYSTbuS
Bleo=
X-Gm-Gg: ASbGncunhNU5kSFQAn0+vxOXQdiOSDw+nqXxvqihY6R2fAblW8/L4By/MWsb87DfuFt
H6gbhVyjf78JxizwocPWl/jK4hB6w1vahgrjyTIg6Isv6fQwcjyeKanfM/8YXyUidaajWFdeJHf
eYbGWOLufygyvcrY9agJVpEnH8a8fB7R0wckRgQ7OwKEJXA8uwee537QK77xZ28ktpAYbpsoait
ZFTBQuZYE6lS6j8bMBlPpACBhmXpJPQoDnYy+cFsvyKq2HqHrAKBmPDCmf3RjTXW/c=
X-Google-Smtp-Source:
AGHT+IElJnFcdcT/LB4j0hruCQiZPgjW4ukUbtLNpF4pGMAG0Gh/qVjGVv8Ya/oidsrZ2JHWPv/hZQ==
X-Received: by 2002:a05:600c:1e1e:b0:434:a5bc:70fc with SMTP id
5b1f17b1804b1-434ddeb51c4mr35959325e9.8.1733512311712;
Fri, 06 Dec 2024 11:11:51 -0800 (PST)
From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Michael S. Tsirkin" <mst@redhat.com>,
Richard Henderson <richard.henderson@linaro.org>,
Eduardo Habkost <eduardo@habkost.net>,
Marcel Apfelbaum <marcel.apfelbaum@gmail.com>,
Zhao Liu <zhao1.liu@intel.com>, Paolo Bonzini <pbonzini@redhat.com>,
=?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@linaro.org>
Subject: [PATCH 3/4] hw/timer/hpet: Have hpet_find() return an Object
Date: Fri, 6 Dec 2024 20:11:23 +0100
Message-ID: <20241206191124.9195-4-philmd@linaro.org>
X-Mailer: git-send-email 2.45.2
In-Reply-To: <20241206191124.9195-1-philmd@linaro.org>
References: <20241206191124.9195-1-philmd@linaro.org>
MIME-Version: 1.0
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::333;
envelope-from=philmd@linaro.org; helo=mail-wm1-x333.google.com
X-Spam_score_int: -20
X-Spam_score: -2.1
X-Spam_bar: --
X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,
DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,
RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001,
SPF_PASS=-0.001 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-BeenThere: qemu-devel@nongnu.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org
X-ZohoMail-DKIM: pass (identity @linaro.org)
X-ZM-MESSAGEID: 1733512379251116600
Signed-off-by: Philippe Mathieu-Daud=C3=A9 <philmd@linaro.org>
---
include/hw/timer/hpet.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/hw/timer/hpet.h b/include/hw/timer/hpet.h
index 2a95799a679..d11cdff0347 100644
--- a/include/hw/timer/hpet.h
+++ b/include/hw/timer/hpet.h
@@ -64,7 +64,7 @@
=20
#define HPET_INTCAP "hpet-intcap"
=20
-static inline bool hpet_find(void)
+static inline Object *hpet_find(void)
{
return object_resolve_path_type("", TYPE_HPET, NULL);
}
--=20
2.45.2
From nobody Sat May 10 07:31:26 2025
Delivered-To: importer@patchew.org
Authentication-Results: mx.zohomail.com;
dkim=pass;
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=pass(p=none dis=none) header.from=linaro.org
ARC-Seal: i=1; a=rsa-sha256; t=1733512353; cv=none;
d=zohomail.com; s=zohoarc;
b=Z46H0EmS5qPAcDRrO553WL9wax6/ize6kVCFw3ZOX9kE3GE6un95ygDZ/MNgXKJFzqrxTtLG912rib9lftSUMlLOne38gfBdvBUFjsW3wRRUYy6b3+bLdk/kLOJ8Iymo+Afj8RE4tepkHt9BzjyBkagtmDC4oRw2fbrH5REnLyg=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
s=zohoarc;
t=1733512353;
h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To;
bh=usuUWxdQ8ewKippAge2X3v0Dk+bE+NLkyVAycBl0ZOQ=;
b=nzRE56h2+fV/xfD7FNaPlGF0M5C5Fp0QYdKTnRulMbAJxmMjVP9X0ROx0RcuwV0iZFonpKfOWAjTYgG8Yye7zfXq1MnrdvY/MZZU16MBIt+vNEPXNbbLpZPB1zDDRkVYYGicacY0hYqyj4QRE2QSTaAs5Ab7keheRp53giSLFDs=
ARC-Authentication-Results: i=1; mx.zohomail.com;
dkim=pass;
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=pass header.from=<philmd@linaro.org> (p=none dis=none)
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
mx.zohomail.com
with SMTPS id 1733512353886145.3784766054472;
Fri, 6 Dec 2024 11:12:33 -0800 (PST)
Received: from localhost ([::1] helo=lists1p.gnu.org)
by lists.gnu.org with esmtp (Exim 4.90_1)
(envelope-from <qemu-devel-bounces@nongnu.org>)
id 1tJdkB-0005xe-Va; Fri, 06 Dec 2024 14:12:04 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10])
by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <philmd@linaro.org>) id 1tJdkA-0005xV-Vt
for qemu-devel@nongnu.org; Fri, 06 Dec 2024 14:12:03 -0500
Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.90_1) (envelope-from <philmd@linaro.org>) id 1tJdk9-0001fS-6k
for qemu-devel@nongnu.org; Fri, 06 Dec 2024 14:12:02 -0500
Received: by mail-wr1-x431.google.com with SMTP id
ffacd0b85a97d-385e2880606so2074950f8f.3
for <qemu-devel@nongnu.org>; Fri, 06 Dec 2024 11:12:00 -0800 (PST)
Received: from localhost.localdomain ([95.127.41.180])
by smtp.gmail.com with ESMTPSA id
ffacd0b85a97d-386219095easm5400867f8f.83.2024.12.06.11.11.56
(version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256);
Fri, 06 Dec 2024 11:11:58 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=linaro.org; s=google; t=1733512319; x=1734117119; darn=nongnu.org;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:from:to:cc:subject:date
:message-id:reply-to;
bh=usuUWxdQ8ewKippAge2X3v0Dk+bE+NLkyVAycBl0ZOQ=;
b=rxmsR1l/a4FkHH7rqqPFaJ55XtXrBfFk3Vv57OqjHE5U6BUP2syAZy4vVjhx/dX+TE
w2fwLFZPp6eJn+H62wM9FvnMauDHKpf2YiiB/TWeUQNnPLNObowTE2YYw2lqRW1gwoLl
FMyWxZ5yjH6XFZd/Fil4KE70kOBE2N9LoXyHC8cSeaVj0gk2LSjimhEoJ9d9BwZYInQt
q0DdrA69d0PvMFmKLnF99ojm2X7YT/cj179q0MOjuaAQfQ7h7vnIMxLA9gjDMAJ1Y9eO
AJ3aJ6Zvv6xEBsBt2u78MRGltcya6Fm8Dw5w8/rLg3kOiODtVdcCUmO3J/HRhTk6OLUD
U8Qg==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1733512319; x=1734117119;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc
:subject:date:message-id:reply-to;
bh=usuUWxdQ8ewKippAge2X3v0Dk+bE+NLkyVAycBl0ZOQ=;
b=EuI0aPwZrmTUWFTqJhSDom3qjpC2aOP4UQ2FGnWbhvpOn4LZJDTZdn5dhdF5ZTp3xH
w6VfluoAh+SHMtjczk+zav2Xe2Pp6WoJvAyzlMKebLWut141Ez4sswBFwSl0gIXg2FNE
dAcri6rXULf7Sji0AsErEMJsk11sjVpj8Fk9jCxcdzQM0eorv6zz8Fyf0X3z7P2uc+Qa
x7rCO7qei8Y8Yvho3OH2D446A4NNJhLyiAp6YkygNAo9ElAK7Gza2o5bMslTYrkedIXm
o7+Gkvy0YbHQb+CaJdkC4otVbvJhAlu8GaLG1Pi6VuIE88fQ8ww5c090oyrsXYfhsgaM
R8nA==
X-Gm-Message-State: AOJu0YxME0vs9WyxKXpHvsQRhNLFIKlGvoU+vctnAfaMCr7hB0ElmOG9
QbdwLJLQcub6TKqAUKc64SHULliGWwT9a/QcJ81eiftJ6LPlKSvucnj55NNohy7Ah1GuDDW94fj
V6X4=
X-Gm-Gg: ASbGncsd61Hw2pJ5K5kmFC/0YWXq2YDhrgv5yK+GA5rOAEQea21VnHjlNUkRjcdD7cu
gGwNrL3zuoT6h3RHY0MRXmctS9kK9q4iLoXfiEJe/afz9ykMbZKTRLQilwpb25lIjlAVM9fIEBt
KXiY/Kld9pWT1kfYvp9tQxHt46MLzS3vgkqlraDGUVDqO71r7jK0je+ux/MfRg6riEanm1nAhJX
y8ixYHifdnzerKjGlTe1sZyTdB3UXf7UFcdtlPLfig8Uc00z7f4GaD0Ya+qNkaHkgA=
X-Google-Smtp-Source:
AGHT+IGLZHNP1iVokAKRip01VWw4auDu3tIDhR95tQQDmSfTUI6AuJvvISDTyS1PxmPYxeH7LzCG4A==
X-Received: by 2002:a05:6000:401e:b0:385:e4a7:df09 with SMTP id
ffacd0b85a97d-3862b3cdcd3mr3352553f8f.44.1733512319429;
Fri, 06 Dec 2024 11:11:59 -0800 (PST)
From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Michael S. Tsirkin" <mst@redhat.com>,
Richard Henderson <richard.henderson@linaro.org>,
Eduardo Habkost <eduardo@habkost.net>,
Marcel Apfelbaum <marcel.apfelbaum@gmail.com>,
Zhao Liu <zhao1.liu@intel.com>, Paolo Bonzini <pbonzini@redhat.com>,
=?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@linaro.org>
Subject: [PATCH 4/4] hw/timer/hpet: Hold fw_cfg state within HPET class
Date: Fri, 6 Dec 2024 20:11:24 +0100
Message-ID: <20241206191124.9195-5-philmd@linaro.org>
X-Mailer: git-send-email 2.45.2
In-Reply-To: <20241206191124.9195-1-philmd@linaro.org>
References: <20241206191124.9195-1-philmd@linaro.org>
MIME-Version: 1.0
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::431;
envelope-from=philmd@linaro.org; helo=mail-wr1-x431.google.com
X-Spam_score_int: -20
X-Spam_score: -2.1
X-Spam_bar: --
X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,
DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,
RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001,
SPF_PASS=-0.001 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-BeenThere: qemu-devel@nongnu.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org
X-ZohoMail-DKIM: pass (identity @linaro.org)
X-ZM-MESSAGEID: 1733512355015116600
We maintain one hpet_cfg[] state for all HPET instances.
Move it to a new HPET class.
Signed-off-by: Philippe Mathieu-Daud=C3=A9 <philmd@linaro.org>
---
hw/timer/hpet.c | 32 ++++++++++++++++++++++----------
1 file changed, 22 insertions(+), 10 deletions(-)
diff --git a/hw/timer/hpet.c b/hw/timer/hpet.c
index 849cb3e669b..c5aeac860b4 100644
--- a/hw/timer/hpet.c
+++ b/hw/timer/hpet.c
@@ -57,7 +57,7 @@ struct hpet_fw_config
=20
#define HPET_MSI_SUPPORT 0
=20
-OBJECT_DECLARE_SIMPLE_TYPE(HPETState, HPET)
+OBJECT_DECLARE_TYPE(HPETState, HPETClass, HPET)
=20
struct HPETState;
typedef struct HPETTimer { /* timers */
@@ -101,7 +101,11 @@ struct HPETState {
uint8_t hpet_id; /* instance id */
};
=20
-static struct hpet_fw_config hpet_cfg =3D {.count =3D UINT8_MAX};
+struct HPETClass {
+ SysBusDeviceClass parent_class;
+
+ struct hpet_fw_config fw_cfg;
+};
=20
static uint32_t hpet_in_legacy_mode(HPETState *s)
{
@@ -279,6 +283,7 @@ static bool hpet_validate_num_timers(void *opaque, int =
version_id)
static int hpet_post_load(void *opaque, int version_id)
{
HPETState *s =3D opaque;
+ HPETClass *hc =3D HPET_GET_CLASS(s);
int i;
=20
for (i =3D 0; i < s->num_timers; i++) {
@@ -295,7 +300,7 @@ static int hpet_post_load(void *opaque, int version_id)
/* Push number of timers into capability returned via HPET_ID */
s->capability &=3D ~HPET_ID_NUM_TIM_MASK;
s->capability |=3D (s->num_timers - 1) << HPET_ID_NUM_TIM_SHIFT;
- hpet_cfg.hpet[s->hpet_id].event_timer_block_id =3D (uint32_t)s->capabi=
lity;
+ hc->fw_cfg.hpet[s->hpet_id].event_timer_block_id =3D (uint32_t)s->capa=
bility;
=20
/* Derive HPET_MSI_SUPPORT from the capability of the first timer. */
s->flags &=3D ~(1 << HPET_MSI_SUPPORT);
@@ -660,6 +665,7 @@ static const MemoryRegionOps hpet_ram_ops =3D {
static void hpet_reset(DeviceState *d)
{
HPETState *s =3D HPET(d);
+ HPETClass *hc =3D HPET_GET_CLASS(d);
SysBusDevice *sbd =3D SYS_BUS_DEVICE(d);
int i;
=20
@@ -682,8 +688,8 @@ static void hpet_reset(DeviceState *d)
s->hpet_counter =3D 0ULL;
s->hpet_offset =3D 0ULL;
s->config =3D 0ULL;
- hpet_cfg.hpet[s->hpet_id].event_timer_block_id =3D (uint32_t)s->capabi=
lity;
- hpet_cfg.hpet[s->hpet_id].address =3D sbd->mmio[0].addr;
+ hc->fw_cfg.hpet[s->hpet_id].event_timer_block_id =3D (uint32_t)s->capa=
bility;
+ hc->fw_cfg.hpet[s->hpet_id].address =3D sbd->mmio[0].addr;
=20
/* to document that the RTC lowers its output on reset as well */
s->rtc_irq_level =3D 0;
@@ -719,23 +725,24 @@ static void hpet_realize(DeviceState *dev, Error **er=
rp)
{
SysBusDevice *sbd =3D SYS_BUS_DEVICE(dev);
HPETState *s =3D HPET(dev);
+ HPETClass *hc =3D HPET_GET_CLASS(dev);
int i;
HPETTimer *timer;
=20
if (!s->intcap) {
warn_report("Hpet's intcap not initialized");
}
- if (hpet_cfg.count =3D=3D UINT8_MAX) {
+ if (hc->fw_cfg.count =3D=3D UINT8_MAX) {
/* first instance */
- hpet_cfg.count =3D 0;
+ hc->fw_cfg.count =3D 0;
}
=20
- if (hpet_cfg.count =3D=3D 8) {
+ if (hc->fw_cfg.count =3D=3D 8) {
error_setg(errp, "Only 8 instances of HPET is allowed");
return;
}
=20
- s->hpet_id =3D hpet_cfg.count++;
+ s->hpet_id =3D hc->fw_cfg.count++;
=20
for (i =3D 0; i < HPET_NUM_IRQ_ROUTES; i++) {
sysbus_init_irq(sbd, &s->irqs[i]);
@@ -773,11 +780,14 @@ static Property hpet_device_properties[] =3D {
static void hpet_device_class_init(ObjectClass *klass, void *data)
{
DeviceClass *dc =3D DEVICE_CLASS(klass);
+ HPETClass *hc =3D HPET_CLASS(klass);
=20
dc->realize =3D hpet_realize;
device_class_set_legacy_reset(dc, hpet_reset);
dc->vmsd =3D &vmstate_hpet;
device_class_set_props(dc, hpet_device_properties);
+
+ hc->fw_cfg.count =3D UINT8_MAX;
}
=20
static const TypeInfo hpet_device_info =3D {
@@ -797,7 +807,9 @@ type_init(hpet_register_types)
=20
bool hpet_add_fw_cfg_bytes(FWCfgState *fw_cfg, Error **errp)
{
- fw_cfg_add_bytes(fw_cfg, FW_CFG_HPET, &hpet_cfg, sizeof(hpet_cfg));
+ HPETClass *hc =3D HPET_GET_CLASS(hpet_find());
+
+ fw_cfg_add_bytes(fw_cfg, FW_CFG_HPET, &hc->fw_cfg, sizeof(hc->fw_cfg));
=20
return true;
}
--=20
2.45.2