From nobody Mon Apr 7 13:20:22 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=1742224458; cv=none;
d=zohomail.com; s=zohoarc;
b=PibTDBxUMFa7mBj4Dd9RUl5MJt/3Fw5bH6+gHkP2CTnJPfkHeiJhZ0W7MPd7ysP1Htj0pnD4m2k5PghHazIyia4h4vXHjR18xAvJzamqFfplS9Cd4ZmUbdVswDPeh/TeEr9YYcB6qkUpDCZKOgXDPh8TyLcoee4t2KRRKZ+1Nb0=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
s=zohoarc;
t=1742224458;
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=1VmmqQBUHfoULk3kEUiv7Q1Tv4nMD3w3H8xDhrkDsrk=;
b=JILSa6GdXtvvWdSSSK1BFEEJyrULexZc+5kEunVtn7p6ABa/RyzYpMB4E328pnB0wQtUsDmWRyfnGzMX5EilWHAaUjdj0moQmdmjhSkqwPIafVxeKDRpe82SYTatX1ETU1s+cQZrGFJJsVAC8VzuAeT2/uzltvxoraEDOhdX7dg=
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=<zhao1.liu@intel.com> (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 1742224458885563.4103413911652;
Mon, 17 Mar 2025 08:14:18 -0700 (PDT)
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 1tuBqY-0005Ca-9k; Mon, 17 Mar 2025 10:53:42 -0400
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 <zhao1.liu@intel.com>)
id 1tuBq4-00050w-8D; Mon, 17 Mar 2025 10:53:12 -0400
Received: from mgamail.intel.com ([192.198.163.10])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <zhao1.liu@intel.com>)
id 1tuBpw-00061r-Le; Mon, 17 Mar 2025 10:53:11 -0400
Received: from orviesa004.jf.intel.com ([10.64.159.144])
by fmvoesa104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;
17 Mar 2025 07:52:40 -0700
Received: from liuzhao-optiplex-7080.sh.intel.com ([10.239.160.39])
by orviesa004.jf.intel.com with ESMTP; 17 Mar 2025 07:52:39 -0700
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple;
d=intel.com; i=@intel.com; q=dns/txt; s=Intel;
t=1742223185; x=1773759185;
h=from:to:cc:subject:date:message-id:in-reply-to:
references:mime-version:content-transfer-encoding;
bh=ag9bMT3K/Qy/WD0rHV7oCIgQvE2QwKHcCQ18m6lilb8=;
b=eJ4eTMjCnWPq9T38+GYAb7e12ZplBOpdjlpKES0wJ/SUfcAsPxhJjX9R
pgc4IhsloSW3yxf7jx6NmHu7Rn21eQZfRyHFjysrDyWEmVw5Da1y2uEHC
Jy3kIMW1DKXAxflp+F99rJCTJnoIcAbceGe9XWe3WijrV7CJrii97+KYs
IvjnrN7xx1f7DCO1NJaIttUnP+svetGi/Jijhu4XAHVbBFnBLSuvFd4IK
qiI7RomiT/BRPxl1ov8wgzelJmKJjrlhYV5gLwVA6kz2Bd0vDDgt+nf5E
z8Zm5r4TUXO2oy8ZTwkDsySfDoeg6ywoKE1TgAYYKOsLhKMF0U7JS0rsF Q==;
X-CSE-ConnectionGUID: gK/sZqIpTxuTH5wFvZVyVA==
X-CSE-MsgGUID: lvowJHRvQrKhxGmgweFCzw==
X-IronPort-AV: E=McAfee;i="6700,10204,11376"; a="54694614"
X-IronPort-AV: E=Sophos;i="6.14,254,1736841600"; d="scan'208";a="54694614"
X-CSE-ConnectionGUID: khGHXd1dRXKF81RFJ+lVQQ==
X-CSE-MsgGUID: juGOFoDcSEGJHzmz5LCYiA==
X-ExtLoop1: 1
X-IronPort-AV: E=Sophos;i="6.14,254,1736841600"; d="scan'208";a="126988531"
From: Zhao Liu <zhao1.liu@intel.com>
To: Paolo Bonzini <pbonzini@redhat.com>
Cc: qemu-devel@nongnu.org, qemu-rust@nongnu.org,
Zhao Liu <zhao1.liu@intel.com>
Subject: [PATCH 10/17] rust/vmstate: Relax array check when build varray in
vmstate_struct
Date: Mon, 17 Mar 2025 23:12:29 +0800
Message-Id: <20250317151236.536673-11-zhao1.liu@intel.com>
X-Mailer: git-send-email 2.34.1
In-Reply-To: <20250317151236.536673-1-zhao1.liu@intel.com>
References: <20250317151236.536673-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.10;
envelope-from=zhao1.liu@intel.com;
helo=mgamail.intel.com
X-Spam_score_int: -46
X-Spam_score: -4.7
X-Spam_bar: ----
X-Spam_report: (-4.7 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.335,
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_RPBL_BLOCKED=0.001,
RCVD_IN_VALIDITY_SAFE_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: <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 @intel.com)
X-ZM-MESSAGEID: 1742224462669019100
Content-Type: text/plain; charset="utf-8"
The varry of structure created by vmstate_struct is different with
vmstate_of. This is because vmstate_struct uses the `vmsd` to traverse
the vmstates of structure's fields, rather than treating the structure
directly as a well-defined vmstate.
Therefore, there's no need to check array flag when building varray by
vmstate_struct.
Signed-off-by: Zhao Liu <zhao1.liu@intel.com>
---
rust/qemu-api/src/vmstate.rs | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/rust/qemu-api/src/vmstate.rs b/rust/qemu-api/src/vmstate.rs
index 2749e8af2b5a..806d531b0c37 100644
--- a/rust/qemu-api/src/vmstate.rs
+++ b/rust/qemu-api/src/vmstate.rs
@@ -275,14 +275,20 @@ pub const fn with_pointer_flag(mut self) -> Self {
}
=20
#[must_use]
- pub const fn with_varray_flag(mut self, flag: VMStateFlags) -> VMState=
Field {
- assert!((self.flags.0 & VMStateFlags::VMS_ARRAY.0) !=3D 0);
+ pub const fn with_varray_flag_unchecked(mut self, flag: VMStateFlags) =
-> VMStateField {
self.flags =3D VMStateFlags(self.flags.0 & !VMStateFlags::VMS_ARRA=
Y.0);
self.flags =3D VMStateFlags(self.flags.0 | flag.0);
self.num =3D 0; // varray uses num_offset instead of num.
self
}
=20
+ #[must_use]
+ #[allow(unused_mut)]
+ pub const fn with_varray_flag(mut self, flag: VMStateFlags) -> VMState=
Field {
+ assert!((self.flags.0 & VMStateFlags::VMS_ARRAY.0) !=3D 0);
+ self.with_varray_flag_unchecked(flag)
+ }
+
#[must_use]
pub const fn with_varray_multiply(mut self, num: u32) -> VMStateField {
assert!(num <=3D 0x7FFF_FFFFu32);
@@ -454,7 +460,7 @@ macro_rules! vmstate_struct {
flags: $crate::bindings::VMStateFlags::VMS_STRUCT,
vmsd: &$vmsd,
..$crate::zeroable::Zeroable::ZERO
- } $(.with_varray_flag(
+ } $(.with_varray_flag_unchecked(
$crate::call_func_with_field!(
$crate::vmstate::vmstate_varray_flag,
$struct_name,
--=20
2.34.1