From nobody Sat Apr 5 01:14:27 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass header.i=@intel.com; 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=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1739155428; cv=none; d=zohomail.com; s=zohoarc; b=D6I1U9Wj5RzUYBKSrR6ZwaDRz5ohE2cr7Esjt4+B16a6Dt5KbFHCxewvyljnOGJgKuhkKwTiju3Ycu34eDwJocKMbLrXkjMHYhFaikrRsSwe5wqE2EXt0kfG60SEMZotUSNygG+v1QFRWkIxWj2EDFgXTu1VGsuiWBhkiyvHE9k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1739155428; h=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=sCES9E7eWRDN4jaRrxiZrAAXkTPCornj8Fo1jkSJIy8=; b=SDt8dAVxPZeuuH3y3XeLzukuid7qEeZphyX++afL9Yz8ZD0tmWxly+JGs/50W05DAODtIFhL4W9nMq4s4jHdHDUrEx6pg7uB+JBII2xWWPQH1s+oXst6OzZbvvCXH89JFcYDulOaAxRGpYymYQ6uRpzhgwnRlbdNaeeDUwmfyrU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=@intel.com; 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= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1739155428046915.1071516035231; Sun, 9 Feb 2025 18:43:48 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1thJjs-000078-1E; Sun, 09 Feb 2025 21:41:36 -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 ) id 1thJjo-00005F-NV; Sun, 09 Feb 2025 21:41:32 -0500 Received: from mgamail.intel.com ([192.198.163.11]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1thJjm-00087f-KO; Sun, 09 Feb 2025 21:41:32 -0500 Received: from fmviesa001.fm.intel.com ([10.60.135.141]) by fmvoesa105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Feb 2025 18:41:27 -0800 Received: from liuzhao-optiplex-7080.sh.intel.com ([10.239.160.39]) by fmviesa001.fm.intel.com with ESMTP; 09 Feb 2025 18:41:24 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1739155291; x=1770691291; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=aBNXUK51XTb5h+RZylc8ESD+bwtNxYy97oEksRtg0Sk=; b=R8i9+Y4p0nuSlUy+loa8f6AaovizCg4IRmzTtrPMo9hHLEUFAKfft4YC g9O029ZDHSWJgkbVw63zHdY6/NHVoDAuUjFGJJ6NTZvBiZbGRQZ1Wo2Sz CBTZJ3CXrRKqXMjdo98iwoKAFONWG8XgG7zJ2BIL3Jun8HV+PogbLs20r M/PQJayYBZEsvmOaOjVbW1ksvcFCdPUPQ12gqRypIMOlXn118z0IGvUsU 5MPh8EnU03tvpXigpUTeuWvxRd1mPTaHW1ZVTP8Mnt+Wbkf4PlqXB9iBZ WHwt8hyjmvBCJn2dMdBaGeT43SIlWftNyvo/rOXwXdybepHzfxRDTG0No g==; X-CSE-ConnectionGUID: 79f50HH7Tqe9jUFgOR6rHg== X-CSE-MsgGUID: q2NYFwAsSNOnx1FVnxLecQ== X-IronPort-AV: E=McAfee;i="6700,10204,11340"; a="50351234" X-IronPort-AV: E=Sophos;i="6.13,273,1732608000"; d="scan'208";a="50351234" X-CSE-ConnectionGUID: aAHcT5VOTl2pOXAz+VEFvQ== X-CSE-MsgGUID: OvR4yrbuRnetMqSyXJmVYA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.12,224,1728975600"; d="scan'208";a="142938200" From: Zhao Liu To: Paolo Bonzini , Manos Pitsidianakis , Junjie Mao , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Peter Maydell , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= Cc: qemu-devel@nongnu.org, qemu-rust@nongnu.org, Zhao Liu Subject: [PATCH v2 01/10] i386/fw_cfg: move hpet_cfg definition to hpet.c Date: Mon, 10 Feb 2025 11:00:42 +0800 Message-Id: <20250210030051.2562726-2-zhao1.liu@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250210030051.2562726-1-zhao1.liu@intel.com> References: <20250210030051.2562726-1-zhao1.liu@intel.com> MIME-Version: 1.0 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=192.198.163.11; envelope-from=zhao1.liu@intel.com; helo=mgamail.intel.com X-Spam_score_int: -57 X-Spam_score: -5.8 X-Spam_bar: ----- X-Spam_report: (-5.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.405, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-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 @intel.com) X-ZM-MESSAGEID: 1739155429425019100 Content-Type: text/plain; charset="utf-8" HPET device needs to access and update hpet_cfg variable, but now it is defined in hw/i386/fw_cfg.c and Rust code can't access it. Move hpet_cfg definition to hpet.c (and rename it to hpet_fw_cfg). This allows Rust HPET device implements its own global hpet_fw_cfg variable, and will further reduce the use of unsafe C code access and calls in the Rust HPET implementation. Signed-off-by: Zhao Liu --- hw/i386/fw_cfg.c | 4 +--- hw/timer/hpet.c | 14 ++++++++------ include/hw/timer/hpet.h | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/hw/i386/fw_cfg.c b/hw/i386/fw_cfg.c index d2cb08715a21..546de63123e6 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 { @@ -153,7 +151,7 @@ FWCfgState *fw_cfg_arch_create(MachineState *ms, PCMachineState *pcms =3D (PCMachineState *)object_dynamic_cast(OBJECT(ms), TYPE_PC_MACHINE); if (pcms && pcms->hpet_enabled) { - fw_cfg_add_bytes(fw_cfg, FW_CFG_HPET, &hpet_cfg, sizeof(hpet_cfg)); + fw_cfg_add_bytes(fw_cfg, FW_CFG_HPET, &hpet_fw_cfg, sizeof(hpet_fw= _cfg)); } #endif =20 diff --git a/hw/timer/hpet.c b/hw/timer/hpet.c index 92b6d509edda..f2e2d83a3f67 100644 --- a/hw/timer/hpet.c +++ b/hw/timer/hpet.c @@ -40,6 +40,8 @@ #include "qom/object.h" #include "trace.h" =20 +struct hpet_fw_config hpet_fw_cfg =3D {.count =3D UINT8_MAX}; + #define HPET_MSI_SUPPORT 0 =20 OBJECT_DECLARE_SIMPLE_TYPE(HPETState, HPET) @@ -655,8 +657,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; + hpet_fw_cfg.hpet[s->hpet_id].event_timer_block_id =3D (uint32_t)s->cap= ability; + hpet_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; @@ -698,17 +700,17 @@ static void hpet_realize(DeviceState *dev, Error **er= rp) if (!s->intcap) { warn_report("Hpet's intcap not initialized"); } - if (hpet_cfg.count =3D=3D UINT8_MAX) { + if (hpet_fw_cfg.count =3D=3D UINT8_MAX) { /* first instance */ - hpet_cfg.count =3D 0; + hpet_fw_cfg.count =3D 0; } =20 - if (hpet_cfg.count =3D=3D 8) { + if (hpet_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 hpet_fw_cfg.count++; =20 for (i =3D 0; i < HPET_NUM_IRQ_ROUTES; i++) { sysbus_init_irq(sbd, &s->irqs[i]); diff --git a/include/hw/timer/hpet.h b/include/hw/timer/hpet.h index 71e8c62453d1..c2656f7f0bef 100644 --- a/include/hw/timer/hpet.h +++ b/include/hw/timer/hpet.h @@ -73,7 +73,7 @@ struct hpet_fw_config struct hpet_fw_entry hpet[8]; } QEMU_PACKED; =20 -extern struct hpet_fw_config hpet_cfg; +extern struct hpet_fw_config hpet_fw_cfg; =20 #define TYPE_HPET "hpet" =20 --=20 2.34.1