From nobody Wed Apr 9 23:02:17 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=1737824392; cv=none;
d=zohomail.com; s=zohoarc;
b=CVlLVSMme11ntvTExDoLnNiCrETj0BAGZL0hjDpKU/6lGaZ7XjZ7xajJRCJzAJEYF6BOSMsuo7PNSZ2hEUxl7cYYEzvxYe5568vdRDSh5/t4+z0b5v0LVmJUMCZ/Ii6KGmANP7kowM1pIRP4SjFPJ80VCEtvhsYaD/o8PPhDBZU=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
s=zohoarc;
t=1737824392;
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=jM1PDPP54X96ITEZl+g5K5x7jxsI9/uafvBKFxpKGD8=;
b=n1LDalxAzuoObC9796oaHA4namFQP14yR8jIzeebm3dxT/4jDtFo5uEF4tKU3iqO5fRv6ai488bTO64F5FFiMuuZA8pjy47BGLfWCcRQEZM+meimDz86+v0QiVDxTmG8EyXIqORiQKgni279JZXb+vepzfk7RvnKkEkOs++Oopk=
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 1737824392068138.8651401842527;
Sat, 25 Jan 2025 08:59:52 -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 1tbjV5-0003zr-Nm; Sat, 25 Jan 2025 11:59: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 <philmd@linaro.org>) id 1tbjV2-0003yq-07
for qemu-devel@nongnu.org; Sat, 25 Jan 2025 11:59:12 -0500
Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d])
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 1tbjV0-0008PV-GF
for qemu-devel@nongnu.org; Sat, 25 Jan 2025 11:59:11 -0500
Received: by mail-wm1-x32d.google.com with SMTP id
5b1f17b1804b1-436326dcb1cso20720895e9.0
for <qemu-devel@nongnu.org>; Sat, 25 Jan 2025 08:59:10 -0800 (PST)
Received: from localhost.localdomain (88-187-86-199.subs.proxad.net.
[88.187.86.199]) by smtp.gmail.com with ESMTPSA id
5b1f17b1804b1-438bd507c59sm66304325e9.17.2025.01.25.08.59.06
(version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256);
Sat, 25 Jan 2025 08:59:06 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=linaro.org; s=google; t=1737824348; x=1738429148; 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=jM1PDPP54X96ITEZl+g5K5x7jxsI9/uafvBKFxpKGD8=;
b=q+06aIkCssHxL4rnWOj0GbETYXxCOi95h8R1Qtma/PBgtfOy7CzkWkpIs3Whbnu44B
DwA+P4cX7XD8bEqECcPXrSnYgeihLJstk/sPKX2VcSNkoCwREr6C7cyRIJ1RKLH0bJQA
Z+xlJOVqZuPZ/azEQ70F55mUDidIBiW/RQbl7bsPXhkhMYKTpkTrAsM71IQPSePrjvht
QzosT5ut67ceHxy45fQFVTsqdgV3iJYlElK4UwY/WxtHY7aBTo44BleESzG8PQFNpIyy
pZaf5WnnOiUz1zutNLkEUPdFwfibQE1VTVhQU+IC5Kl9tS0IDCJEGKE+5TtkqTSXNE08
BjoQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1737824348; x=1738429148;
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=jM1PDPP54X96ITEZl+g5K5x7jxsI9/uafvBKFxpKGD8=;
b=OJ4/nvz+7llVL1h3kakHa+kdoYGzgVMto+bzLP0MFatS2iguLU25egpgetusycDWYc
7E+Z+Z7S1QOxo2Y8O46LytPgkx5PWPVs4mtz6zt7Ec3ET49oeDzGk02nHHsdmDDQZhuk
hga/LkhAenZd3VTtp2t441+mg7nwkddgnjQd0riSHEyp3MUju4/B3CFsA+gxlVEg+YFH
FjMZU3yAM7PgHh5Gf74hOGaGOrvQMivHwYuIaIhaXeUvEP28ZjsEIN8pgmAywFg445gC
VZXN1h11zYotBKgusnaTP3s7GR2K/nokQIkXD449Rw5G3cc1J4ME/oJd/EGt4V0xAvJf
qvFQ==
X-Gm-Message-State: AOJu0Yx5vU3fm7fXkn5lm9bfvM8s9JhO06a84wSTbD+sxvUgvHuc9DFE
fMP0AyxwhhnEXRKz1O9nWF5VfmwjDY776FDn97QIm4ZqivGoAZJycR3iqj/ZVEg1AM0+g+nB0Mh
UyVA=
X-Gm-Gg: ASbGncsELMBS1qW0CadnXehGQXDg7v7Kw/e8La0BV+WbWn5Sjpl5iBgxzust6fBrn+J
B1BCKt46xl1fUeJM+RM7VJCvURjmOmmzF1ms6QL3Mgvu96G7zo69JbLrEngIdx2vlY4UBHlXqfW
vCdQhsisv44C27FH65+n1HkdG8kGWEjEAUDBUig308YTFdg0fLVih5+x+x7nKb+9ziJYVrWN9Gf
2UZI7Rc4UT4ipbzwBoCUD1qvromUnQcQ1wTYA3qaaU99UcGAU8M8Es3fIPeTBs5ijqqXayKV5Uy
r1Wgu5eSuwyfTrR9E6TFlueB7qDsMKM4fAK0TKiCzxS9Keulkd60W8k=
X-Google-Smtp-Source:
AGHT+IEstb4RZCs9m6dWIM/YMoKVchpKZu+hmMSvyEt3TEhmfaGBpswIi44gipDf2veJAgKr/x79kQ==
X-Received: by 2002:a05:600c:1f10:b0:434:ff9d:a370 with SMTP id
5b1f17b1804b1-438912d1d49mr340960205e9.0.1737824348113;
Sat, 25 Jan 2025 08:59:08 -0800 (PST)
From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@linaro.org>
To: qemu-devel@nongnu.org
Cc: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>,
qemu-rust@nongnu.org, Eduardo Habkost <eduardo@habkost.net>,
Manos Pitsidianakis <manos.pitsidianakis@linaro.org>,
Paolo Bonzini <pbonzini@redhat.com>, Markus Armbruster <armbru@redhat.com>,
=?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@linaro.org>
Subject: [PATCH 2/2] qom: Introduce class_post_init() handler
Date: Sat, 25 Jan 2025 17:58:55 +0100
Message-ID: <20250125165855.32168-3-philmd@linaro.org>
X-Mailer: git-send-email 2.47.1
In-Reply-To: <20250125165855.32168-1-philmd@linaro.org>
References: <20250125165855.32168-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::32d;
envelope-from=philmd@linaro.org; helo=mail-wm1-x32d.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,
T_SCC_BODY_TEXT_LINE=-0.01 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: <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: 1737824395557019000
Add a class_post_init() handler to be called by parents
*after* child class_init() handler is called. This is
necessary to have parent class check children properly
set some values or mandatory handlers.
Signed-off-by: Philippe Mathieu-Daud=C3=A9 <philmd@linaro.org>
---
include/qom/object.h | 7 +++++--
qom/object.c | 10 ++++++++++
rust/qemu-api/src/qom.rs | 6 ++++++
3 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/include/qom/object.h b/include/qom/object.h
index 3776267e903..d1e437a81be 100644
--- a/include/qom/object.h
+++ b/include/qom/object.h
@@ -465,8 +465,10 @@ struct Object
* has occurred to allow a class to set its default virtual method point=
ers.
* This is also the function to use to override virtual methods from a p=
arent
* class.
- * @class_data: Data to pass to the @class_init,
- * @class_base_init. This can be useful when building dynamic
+ * @class_post_init: This function is called to finish initialization of
+ * a class, after all @class_init functions were called.
+ * @class_data: Data to pass to the @class_base_init, @class_init, and
+ * @class_post_init. This can be useful when building dynamic
* classes.
* @interfaces: The list of interfaces associated with this type. This
* should point to a static array that's terminated with a zero filled
@@ -488,6 +490,7 @@ struct TypeInfo
=20
void (*class_base_init)(ObjectClass *klass, void *data);
void (*class_init)(ObjectClass *klass, void *data);
+ void (*class_post_init)(ObjectClass *klass, void *data);
void *class_data;
=20
InterfaceInfo *interfaces;
diff --git a/qom/object.c b/qom/object.c
index 1a686dff5a0..694009f0c94 100644
--- a/qom/object.c
+++ b/qom/object.c
@@ -56,6 +56,7 @@ struct TypeImpl
=20
void (*class_base_init)(ObjectClass *klass, void *data);
void (*class_init)(ObjectClass *klass, void *data);
+ void (*class_post_init)(ObjectClass *klass, void *data);
=20
void *class_data;
=20
@@ -121,6 +122,7 @@ static TypeImpl *type_new(const TypeInfo *info)
=20
ti->class_base_init =3D info->class_base_init;
ti->class_init =3D info->class_init;
+ ti->class_post_init =3D info->class_post_init;
ti->class_data =3D info->class_data;
=20
ti->instance_init =3D info->instance_init;
@@ -416,6 +418,14 @@ static void type_initialize(TypeImpl *ti)
if (ti->class_init) {
ti->class_init(ti->class, ti->class_data);
}
+
+ parent =3D type_get_parent(ti);
+ while (parent) {
+ if (parent->class_post_init) {
+ parent->class_post_init(ti->class, ti->class_data);
+ }
+ parent =3D type_get_parent(parent);
+ }
}
=20
static void object_init_with_type(Object *obj, TypeImpl *ti)
diff --git a/rust/qemu-api/src/qom.rs b/rust/qemu-api/src/qom.rs
index 6033228e338..d95e90153a9 100644
--- a/rust/qemu-api/src/qom.rs
+++ b/rust/qemu-api/src/qom.rs
@@ -470,6 +470,11 @@ pub trait ObjectImpl: ObjectType + ClassInitImpl<Self:=
:Class> {
unsafe extern "C" fn(klass: *mut ObjectClass, data: *mut c_void),
> =3D None;
=20
+ /// Called to finish initialization of a class.
+ const CLASS_POST_INIT: Option<
+ unsafe extern "C" fn(klass: *mut ObjectClass, data: *mut c_void),
+ > =3D None;
+
const TYPE_INFO: TypeInfo =3D TypeInfo {
name: Self::TYPE_NAME.as_ptr(),
parent: Self::ParentType::TYPE_NAME.as_ptr(),
@@ -488,6 +493,7 @@ pub trait ObjectImpl: ObjectType + ClassInitImpl<Self::=
Class> {
class_size: core::mem::size_of::<Self::Class>(),
class_base_init: Self::CLASS_BASE_INIT,
class_init: Some(rust_class_init::<Self>),
+ class_post_init: Self::CLASS_POST_INIT,
class_data: core::ptr::null_mut(),
interfaces: core::ptr::null_mut(),
};
--=20
2.47.1