From nobody Thu Jan 8 13:19:46 2026 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1766827252; cv=none; d=zohomail.com; s=zohoarc; b=cR3QuVHWpp9qLK69hh9436pb2QD3Pv3E56t5xqIvIKWV1e9swveSykiOjsZKZWUClglxqFHRHO/fj2tGLwtrbXqYXZPWz1GBLWxOfayy6gVZG8v0kJjguSqGqfaAOKHl7cQnxvQaCi4NdpYp1pf6zhSXIzAEhs+N8hHe8e/WotU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1766827252; 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=Sg+vJcpOM9SDnQu5i+ms6oyFRoJtaCHlqpcmC/jWSQA=; b=noeKXVSkEZohcgJ/GrDOSharU0wUNa1BC/HbnnjGUGiSOsubyAwpZfK0dyTDuGPWzLMpulR+lmSWik66N+pmhxwTfEz5vdO5aBc7OGhW4ENlz0131F8LEs5/dYdE31k/oWpbbvtA0nFO5Q3J6S7VIKjS/aQ5pxlvMQx46gAV8t4= 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= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1766827252166457.7122989009215; Sat, 27 Dec 2025 01:20:52 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vZQRD-0006X1-7O; Sat, 27 Dec 2025 04:18:15 -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 1vZQR9-0006DB-PH for qemu-devel@nongnu.org; Sat, 27 Dec 2025 04:18:11 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vZQR7-0003bv-Uz for qemu-devel@nongnu.org; Sat, 27 Dec 2025 04:18:11 -0500 Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-265-wLiLrZ4pOLKs6-l8BY-gOg-1; Sat, 27 Dec 2025 04:18:07 -0500 Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-477b8a667bcso106201465e9.2 for ; Sat, 27 Dec 2025 01:18:07 -0800 (PST) Received: from [192.168.10.48] ([151.95.145.106]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-47d19352306sm426326215e9.5.2025.12.27.01.18.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 27 Dec 2025 01:18:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1766827089; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Sg+vJcpOM9SDnQu5i+ms6oyFRoJtaCHlqpcmC/jWSQA=; b=h9vUGC2Ji26mBbf6jT7FXDFdcQHX+4YHf0ybRtZmJxkbJVKP8JpxURTU9dMZgyiJsRV3AV HMfzsebmRaMjcFeCBNH6ksIS8pBQfTar+IxywqurZBBpY0UCXGV9lMWjZK3+rWhS1jLO2A KXNcL3Tz0F8out/0NU3xg9f3TLQ2GQ8= X-MC-Unique: wLiLrZ4pOLKs6-l8BY-gOg-1 X-Mimecast-MFC-AGG-ID: wLiLrZ4pOLKs6-l8BY-gOg_1766827086 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1766827085; x=1767431885; 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=Sg+vJcpOM9SDnQu5i+ms6oyFRoJtaCHlqpcmC/jWSQA=; b=W+slPMaqdxkuyhcmoKZapYVnZr3r5m1IOpbLx5mWQBLTVPWp+rqd1K19/NoKPay0NO t+ILxlFfschEiPQj0wAfIPABw+fTBb0T/T1KZK/owRQ2i2bMEiZhxihMYE3GrmoxGwUL u2h7fHGhPh5PBns9dT3ozkoQsDQbyaWT4h0IapjdY160Pdy+UE60ySR647oLV5Ij1nd+ mOdrcG4OtJSMG8x5FjrB9u6c8m3tbmYS2+Ztn5BIu8l6BV8AP+Q5SVfErG5qL2npXwsG Crz62vXxg0GUYVckvX6zrd1Jc9h57vnLFnWovUwf3nw7XXnsa6G1cyXYRwVNeaeQAHLm fj4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1766827085; x=1767431885; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=Sg+vJcpOM9SDnQu5i+ms6oyFRoJtaCHlqpcmC/jWSQA=; b=cxSy3pOYrsj3MVHUs+YAPs+7tnm7gFoNY8hfncnHecLa2sLMXXNrd3gr+GWjyrv+eO /bKybYYKbEtAGuGlp98dTakuSAi2Dlk0GyrlZDnwueqWWRJpWg5vdqNemY0dP79omcCN ambjG96GyEt5eIuyntQ1MzT4hOCOpQUzSmSSP7FlSmovYWl9NciBkccOaKIaqPWOqDZH wQnyxqvK7TR1J4iNAjYyLnyoANERSZ5THSxgbP2oA+xIunFQ1vhzJBJ8XMwv8o8jFk5k +K6go+keWddbsPzEOeuFRNnv3SsOFDFaDRayRtvoa0AWcj1pY84sztOfTlO2UiSZfhA/ g/Rg== X-Gm-Message-State: AOJu0YwZpe52KYRJxffLdRR8Do6L+IatoBlDeJw1bIgaw2Tm0kYqLMXY Z2Wp8WN+tQ6A016GVrUUNAHGOi1bfGX96ifdBMflqrCvlzSRv1aHYAIjWqb+JL+0QdZsw+yeZ8o KTx3B88FK6PgCrV4oUJ2PAMSQ+zt21k12k1VuCUhJjXvtCpZL54P2V1bgel+lvSjXOg5x1t31pF 1Ww5fwPgwmLx0czRol1x24LUd6lfEMH0NbiygDlkO0 X-Gm-Gg: AY/fxX7HO+RlEePIwLoLvH+y2RdClpE1GSLBNyRy6XUA+u+SeRxqrdSfh4nAQO2htBK rbHtjv3ji4o4CvaEFEwsBDeqmF0Xucr8395Ek42Qhwt0MklgFJQ37OSr3zUjqGZ9etTdG/er7m5 E8slfaJ2a7ogqR+39XpDUMM/Lw96lmFGhvwWEsTlEUN+ZxJcGOUPTilqYfM1bt+jboD5AhBv9QZ kKy99xpzXrcYO9HZbib4Z+K5c1S5V8uQp5DO50491EFSZeTKDjh67029Sk96n7LhFVwN+gRnQp1 OGxnVzud8xoOuHz5ZdAYBln1PDwOM6fByheywFjnhYKcIOSqVihNfWd+HRUzwtPnwjG5jHo5++c RkStK8HiVeikxmyZ++l0cZE4tn+bBTuvKoI7wyWW1VFPQSGnXzgp1aonynMVXPxvnEgi2stDvsB PLQ+DR/gJ+GGwPfoU= X-Received: by 2002:a05:600c:4e90:b0:471:989:9d7b with SMTP id 5b1f17b1804b1-47d19594b70mr313924525e9.21.1766827084584; Sat, 27 Dec 2025 01:18:04 -0800 (PST) X-Google-Smtp-Source: AGHT+IFE7i6ZEnTNrEmB5MRtEzCMUrtPWXBAcpCLUqqxEId3eDGYajm90HX4xh5Fcslwv8WWVSIRYg== X-Received: by 2002:a05:600c:4e90:b0:471:989:9d7b with SMTP id 5b1f17b1804b1-47d19594b70mr313924195e9.21.1766827084099; Sat, 27 Dec 2025 01:18:04 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Zhao Liu Subject: [PULL 053/153] rust/hpet: Rename decoded "reg" enumeration to "target" Date: Sat, 27 Dec 2025 10:14:40 +0100 Message-ID: <20251227091622.20725-54-pbonzini@redhat.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20251227091622.20725-1-pbonzini@redhat.com> References: <20251227091622.20725-1-pbonzini@redhat.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 (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=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_PASS=-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 @redhat.com) X-ZM-MESSAGEID: 1766827253789158500 Content-Type: text/plain; charset="utf-8" From: Zhao Liu HPETAddrDecode has a `reg` field so that there're many variables named "reg" in MMIO read/write/decode functions. In the future, there'll be other HPETRegisters/HPETTimerRegisters structs containing values of HPET registers, and related variables or arguments will be named as "regs". To avoid potential confusion between many "reg" and "regs", rename HPETAddrDecode::reg to HPETAddrDecode::target, and rename decoding related variables from "reg" to "target". "target" is picked as the name since this clearly reflects the field or variable is the target decoded register. Signed-off-by: Zhao Liu Link: https://lore.kernel.org/r/20251113051937.4017675-10-zhao1.liu@intel.c= om Signed-off-by: Paolo Bonzini --- rust/hw/timer/hpet/src/device.rs | 33 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/rust/hw/timer/hpet/src/device.rs b/rust/hw/timer/hpet/src/devi= ce.rs index 3e8f5397fb2..c5b58f8dee7 100644 --- a/rust/hw/timer/hpet/src/device.rs +++ b/rust/hw/timer/hpet/src/device.rs @@ -136,7 +136,7 @@ enum DecodedRegister<'a> { struct HPETAddrDecode<'a> { shift: u32, len: u32, - reg: DecodedRegister<'a>, + target: DecodedRegister<'a>, } =20 const fn hpet_next_wrap(cur_tick: u64) -> u64 { @@ -497,21 +497,20 @@ fn callback(&mut self) { self.update_irq(true); } =20 - const fn read(&self, reg: TimerRegister) -> u64 { + const fn read(&self, target: TimerRegister) -> u64 { use TimerRegister::*; - match reg { + match target { CFG =3D> self.config, // including interrupt capabilities CMP =3D> self.cmp, // comparator register ROUTE =3D> self.fsb, } } =20 - fn write(&mut self, reg: TimerRegister, value: u64, shift: u32, len: u= 32) { + fn write(&mut self, target: TimerRegister, value: u64, shift: u32, len= : u32) { use TimerRegister::*; =20 trace::trace_hpet_ram_write_timer_id(self.index); - - match reg { + match target { CFG =3D> self.set_tn_cfg_reg(shift, len, value), CMP =3D> self.set_tn_cmp_reg(shift, len, value), ROUTE =3D> self.set_tn_fsb_route_reg(shift, len, value), @@ -779,34 +778,34 @@ fn decode(&self, mut addr: hwaddr, size: u32) -> HPET= AddrDecode<'_> { let len =3D std::cmp::min(size * 8, 64 - shift); =20 addr &=3D !4; - let reg =3D if (0..=3D0xff).contains(&addr) { + let target =3D if (0..=3D0xff).contains(&addr) { GlobalRegister::try_from(addr).map(DecodedRegister::Global) } else { let timer_id: usize =3D ((addr - 0x100) / 0x20) as usize; if timer_id < self.num_timers { TimerRegister::try_from(addr & 0x18) - .map(|reg| DecodedRegister::Timer(&self.timers[timer_i= d], reg)) + .map(|target| DecodedRegister::Timer(&self.timers[time= r_id], target)) } else { trace::trace_hpet_timer_id_out_of_range(timer_id.try_into(= ).unwrap()); Err(addr) } }; =20 - // reg is now a Result + // `target` is now a Result // convert the Err case into DecodedRegister as well - let reg =3D reg.unwrap_or_else(DecodedRegister::Unknown); - HPETAddrDecode { shift, len, reg } + let target =3D target.unwrap_or_else(DecodedRegister::Unknown); + HPETAddrDecode { shift, len, target } } =20 fn read(&self, addr: hwaddr, size: u32) -> u64 { trace::trace_hpet_ram_read(addr); =20 - let HPETAddrDecode { shift, reg, .. } =3D self.decode(addr, size); + let HPETAddrDecode { shift, target, .. } =3D self.decode(addr, siz= e); =20 use GlobalRegister::*; use DecodedRegister::*; - (match reg { - Timer(timer, tn_reg) =3D> timer.borrow_mut().read(tn_reg), + (match target { + Timer(timer, tn_target) =3D> timer.borrow_mut().read(tn_target= ), Global(CAP) =3D> self.capability.get(), /* including HPET_PERI= OD 0x004 */ Global(CFG) =3D> self.config.get(), Global(INT_STATUS) =3D> self.int_status.get(), @@ -829,14 +828,14 @@ fn read(&self, addr: hwaddr, size: u32) -> u64 { } =20 fn write(&self, addr: hwaddr, value: u64, size: u32) { - let HPETAddrDecode { shift, len, reg } =3D self.decode(addr, size); + let HPETAddrDecode { shift, len, target } =3D self.decode(addr, si= ze); =20 trace::trace_hpet_ram_write(addr, value); =20 use GlobalRegister::*; use DecodedRegister::*; - match reg { - Timer(timer, tn_reg) =3D> timer.borrow_mut().write(tn_reg, val= ue, shift, len), + match target { + Timer(timer, tn_target) =3D> timer.borrow_mut().write(tn_targe= t, value, shift, len), Global(CAP) =3D> {} // General Capabilities and ID Register: R= ead Only Global(CFG) =3D> self.set_cfg_reg(shift, len, value), Global(INT_STATUS) =3D> self.set_int_status_reg(shift, len, va= lue), --=20 2.52.0