From nobody Fri Nov 14 18:19:02 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1761651553; cv=none; d=zohomail.com; s=zohoarc; b=Bx0eiV7IdmuHTguiNhTT5faNnBTf0SCa4morYiZHPozmHLNKG+P70bss5BAwRoP8xlKHfYoIqpd50yraOzAcPI5TknZMCJ2ZKDwCrcPw+nbP5GygfAWER7U55/aiEnyoyvC6A6LeRvY/6MA3hXvnjZsvNkk8yhHrygEnzwNx9NM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761651553; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=a574bfKXPLraHbw9jj5peIvYFBrcTFaJN0NoFwezcZA=; b=U8xtp/8Tm6WtLotv+MuIPDiEvSMhPbwGhCXUv+WwhlCmx5aNWbAYIx1QROX9frKF3FnZ5m825RkpXF8IzZRgDFzILTC6Gg+0UUxuTSz48El/SRWdOWFk4SyCgnDvJeD7Vvf2oH1z8jYCnGJJHnCwKgT8D2B49hJMC0mrTqwe07U= 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 176165155359164.3115562581628; Tue, 28 Oct 2025 04:39:13 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vDi2F-0007pA-Ly; Tue, 28 Oct 2025 07:38:44 -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 ) id 1vDi2A-0007oX-Qs for qemu-devel@nongnu.org; Tue, 28 Oct 2025 07:38:39 -0400 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 1vDi25-0004uw-EQ for qemu-devel@nongnu.org; Tue, 28 Oct 2025 07:38:37 -0400 Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-455-Ru286tihOKCqkPtazumPRA-1; Tue, 28 Oct 2025 07:38:25 -0400 Received: by mail-wm1-f72.google.com with SMTP id 5b1f17b1804b1-47717c2737bso2719115e9.2 for ; Tue, 28 Oct 2025 04:38:25 -0700 (PDT) Received: from [192.168.10.48] ([151.95.110.222]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4771bc597c7sm7614935e9.1.2025.10.28.04.38.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Oct 2025 04:38:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1761651506; 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; bh=a574bfKXPLraHbw9jj5peIvYFBrcTFaJN0NoFwezcZA=; b=ebr9xNe1JcMIRumqFvGTNSn88WLhkBUuht6QxLkQwMOxyULA45ch2EiAqRGNthwMKNh2aV PcaWgS7cgsIhhIJPP/u/RFMWd3mWnHQ93lp5c31kaoVMXedi0wR685iCBw3hpRk0jvXs64 GQMa/dLYMQQzXZ1GNmo7jCMosMwoGjY= X-MC-Unique: Ru286tihOKCqkPtazumPRA-1 X-Mimecast-MFC-AGG-ID: Ru286tihOKCqkPtazumPRA_1761651504 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761651503; x=1762256303; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=a574bfKXPLraHbw9jj5peIvYFBrcTFaJN0NoFwezcZA=; b=ceQ4Zmbh31LCgMiSKmJqehX+/zapDgGjAEgueJd5dx0pvEeeE8h1aquSivvE/0Lp7R P+bhKONWhlRIKBj/JTZeDUDTD3Er13yvGCGo7SPTMMMbfIDdhDE1sjH5yGT53dtDFjyA zjfotw49RtQhPj9+1gwH9ppLYUgCr5JWbTDtj2S/9H3qrfwyca753friVCX8iPY81zJi z5PpVqGBPaTHWkF8cEAzwjBZ31JMn8IGbavE3kvkJscJXXwSSANLoNIJ6weGRkt2NgBN DRXFTBuoiYNeuV5Bgke7fCEnIvtsC1yT7W5V31eSXy+eugseyGi90kOMZ4ctJScx7VBF yLqg== X-Gm-Message-State: AOJu0Yz+WssdkZKO0r1h5nRqTOXs2Jw6kPMg+XNsysYTZjyzceKz9Ubx /BKdPpw33dxLrHnD/Qdne6ozokSNIs4jdbIQWqrkgZkluSzRK4qaFRo85eP46HI0VZr9VaCPljQ +0rRtL7qGDrOzbEdh5PUr2mkBSiz/pf2QFmzVVA6ihc8qwDX+CuMOpML9Sm0R9lR3hPAFpslVdj M/eNAxGpnxDMmiFd9ur+li1pXIwwaWs5dZLKXIKfwh X-Gm-Gg: ASbGncsusPA5x9WMgsmcaoKSOwXZkGti/fJGdoLRf8304SlK+SGUOyjgIa2c0w23i6g vRn9fwX9YbviYOJeoNiT8O/9t1K8IArcg8hMu4KuhvebMLtO36FafxtQ+57joX+joZ49IxuBhtq vE1sNoZ0FmFzt1eH70py3XgFrv1UsiFC0isd4WZxhTAeyi9JP0IkNGUIhGQVIBv6K4iaUvUxmsh H8UYI+uBqOvbGka4sCR/C6H+fPdu1MXvBzfv3CBS6kawtlCEUjsFfpnvYvjG7iJJXgq6SXjKPR9 P01qFm4YUXtmqu475GZv3scKndNx2HsmhzJGlVYyDjXei3QrgcxFxW8t4/fdrrHspezHnXGPAwH 1PEzPCxv6nv0sL7KyIwVCVZC2vIQkBxWlAZG1wrtsJTBoHOXkLXGdSeSgpLi2US9hm27DVEP+3P Bihog= X-Received: by 2002:a05:600d:6348:b0:477:1be1:9afe with SMTP id 5b1f17b1804b1-4771be19d6emr7058705e9.9.1761651503419; Tue, 28 Oct 2025 04:38:23 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFv0jNmYx0Af9PZs2AJZV5+nVN6X2LPf/KrXe3m1I3ko4nYkjq0LPFaael3P2zvvhQRRJykIA== X-Received: by 2002:a05:600d:6348:b0:477:1be1:9afe with SMTP id 5b1f17b1804b1-4771be19d6emr7058525e9.9.1761651502939; Tue, 28 Oct 2025 04:38:22 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: qemu-rust@nongnu.org, Chen Miao Subject: [PATCH] rust: migration: allow passing ParentField<> to vmstate_of! Date: Tue, 28 Oct 2025 12:38:21 +0100 Message-ID: <20251028113821.1736215-1-pbonzini@redhat.com> X-Mailer: git-send-email 2.51.1 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=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_H3=0.001, RCVD_IN_MSPIKE_WL=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=unavailable 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: 1761651556253154100 Content-Type: text/plain; charset="utf-8" The common superclass for devices could have its own migration state; for it to be included in the subclass's VMState, ParentField<> must implement the VMState trait. Reported-by: Chen Miao Signed-off-by: Paolo Bonzini Reviewed-by: Zhao Liu --- roms/opensbi | 2 +- rust/migration/src/vmstate.rs | 3 ++- rust/qom/src/qom.rs | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/roms/opensbi b/roms/opensbi index a32a9106911..43cace6c367 160000 --- a/roms/opensbi +++ b/roms/opensbi @@ -1 +1 @@ -Subproject commit a32a91069119e7a5aa31e6bc51d5e00860be3d80 +Subproject commit 43cace6c3671e5172d0df0a8963e552bb04b7b20 diff --git a/rust/migration/src/vmstate.rs b/rust/migration/src/vmstate.rs index 42e5df8d818..5a237c409ac 100644 --- a/rust/migration/src/vmstate.rs +++ b/rust/migration/src/vmstate.rs @@ -268,7 +268,7 @@ macro_rules! impl_vmstate_transparent { ($type:ty where $base:tt: VMState $($where:tt)*) =3D> { unsafe impl<$base> $crate::vmstate::VMState for $type where $base:= $crate::vmstate::VMState $($where)* { const BASE: $crate::vmstate::VMStateField =3D $crate::vmstate:= :VMStateField { - size: mem::size_of::<$type>(), + size: ::core::mem::size_of::<$type>(), ..<$base as $crate::vmstate::VMState>::BASE }; const VARRAY_FLAG: $crate::bindings::VMStateFlags =3D <$base a= s $crate::vmstate::VMState>::VARRAY_FLAG; @@ -282,6 +282,7 @@ unsafe impl<$base> $crate::vmstate::VMState for $type w= here $base: $crate::vmsta impl_vmstate_transparent!(std::cell::UnsafeCell where T: VMState); impl_vmstate_transparent!(std::pin::Pin where T: VMState); impl_vmstate_transparent!(common::Opaque where T: VMState); +impl_vmstate_transparent!(std::mem::ManuallyDrop where T: VMState); =20 #[macro_export] macro_rules! impl_vmstate_bitsized { diff --git a/rust/qom/src/qom.rs b/rust/qom/src/qom.rs index 5808051cd77..84455cea79b 100644 --- a/rust/qom/src/qom.rs +++ b/rust/qom/src/qom.rs @@ -102,7 +102,7 @@ }; =20 use common::Opaque; -use migration::impl_vmstate_pointer; +use migration::{impl_vmstate_pointer, impl_vmstate_transparent}; =20 use crate::bindings::{ self, object_class_dynamic_cast, object_dynamic_cast, object_get_class= , object_get_typename, @@ -182,6 +182,7 @@ fn as_ref(&self) -> &$parent { #[derive(Debug)] #[repr(transparent)] pub struct ParentField(std::mem::ManuallyDrop); +impl_vmstate_transparent!(ParentField where T: VMState + ObjectType); =20 impl Deref for ParentField { type Target =3D T; --=20 2.51.1