From patchwork Sat Jan 25 16:58:54 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 13950441 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 678CCC0218C for ; Sat, 25 Jan 2025 16:59:52 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tbjUz-0003yQ-SC; Sat, 25 Jan 2025 11:59:09 -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 1tbjUw-0003xR-9c for qemu-devel@nongnu.org; Sat, 25 Jan 2025 11:59:07 -0500 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tbjUu-0008Of-Oc for qemu-devel@nongnu.org; Sat, 25 Jan 2025 11:59:06 -0500 Received: by mail-wr1-x434.google.com with SMTP id ffacd0b85a97d-3863c36a731so2624465f8f.1 for ; Sat, 25 Jan 2025 08:59:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1737824343; x=1738429143; 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=X7KSVe0Pu2BA5nyUjsZvrSv4yu0Zq1gmeaMsg5YcpCk=; b=MW1MlkQle2TEkxFbsOvyhv67COVhN7Z/fjKq7u2Y8uCKr3H/TN8tqrXjn/kngdiacf Csfjrk1OJOz7vXUxaRTXRwEzyRjVD5wgshKklx56YYiFqnk02SQkR9HGg2AtV5kFEUDk qYeWRvWubKMIgUB+vS1RBt4vyLofPSsebDw0CmzF4DNRw3AKZ6BU3nI4fJJSwZF9hEKW NMpA1k4XmlPa+8u1gxDD7jue929IkM46ddPETX+xmZde5DbNtJNVCfCCjApQXnk7vSju s7BhtykwWvjvNyy6N6BvBEasULXehN+Qr80+dItQFNwD7+2sV2Wlhbtx2BQnSmINwSQt N6eA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737824343; x=1738429143; 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=X7KSVe0Pu2BA5nyUjsZvrSv4yu0Zq1gmeaMsg5YcpCk=; b=CiHMTSICC6b0dlZeB9ntSrXAF1kFvZfXhPJu6/7D2Bj77KtvAcMzzU+8KOKG7av7b+ KFD/mt8+qhhl5nKYG4SkzQt8tHigCzdI9VLn9xtUHostxQGx6mIHNZFOHw5QAu8V+5+5 z7/U5VQciOazeDPrUOYCgc/zgbDKXUQihw3+MwzynSMH49xj+Yg3H3sJG8DjwV9/RhaO rUbksjNcn6BOdmye3sKmatAqfXL5EMykfbGDHklkX2RtY8zIdHovDKfL/fbvCgwRtFWp 0zDvRoaiZw4Xd1KFrpiJDnso2cHLbLDZIbgMDgh8jUnvbMIRFOvNTZ/0dwRNwqH2Gben byjw== X-Gm-Message-State: AOJu0Yzo5yn7OI/iqGI+JU64IUgUwF47UIfZHP5sC1ta7ReX38nTOMEt Car4Euqt5Xban7wwlHAaS4mGh+MBufIJPqrv7st1thgz3tDJCT7tTsABq09T6qowEFQzooWrAcD scGY= X-Gm-Gg: ASbGnctGYIKOpWiM7uia4O9ps6SWMBiuB3D8CrjpKt8u36fy143s9Ezy6XHmIGK8JSw VGTlaT6SROJ2jZyi0tC5ABl5dHM3dEbqfxm+atYw7/1LrVFzLihUDRIsQYQRtuOAm8C80vGQitY CjqSb4HWQznyAaxkxZ7KBUPnvPU8fo0V9RX7XO07MLdDDl7wScE3dt5KsomU41IETWvph3RUCLp y25gbT+7PVV5gg4YB3qEMcKMocTZoMdD2GL6QNGXi8q3wcAwn8rtBwHtgsLi7s4rWeNVAUG0Tyz ijbZrIWtJLYckYovd13WndC0Ca9YocxqBtInFBS3lqz9wRnoSbX35mU= X-Google-Smtp-Source: AGHT+IEY/q6snjyQOBUoXWOdiFJPHuSkxSsUtir/U13sCGxAW4WnvHOwbzKXZWBGrF6VG97E7JoS1w== X-Received: by 2002:a05:6000:1e48:b0:385:f00a:a45b with SMTP id ffacd0b85a97d-38bf5784bdamr26780412f8f.21.1737824342701; Sat, 25 Jan 2025 08:59:02 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-38c2a1bb0easm5966939f8f.77.2025.01.25.08.59.01 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sat, 25 Jan 2025 08:59:01 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , qemu-rust@nongnu.org, Eduardo Habkost , Manos Pitsidianakis , Paolo Bonzini , Markus Armbruster , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH 1/2] qom: Declare class_base_init() before class_init() Date: Sat, 25 Jan 2025 17:58:54 +0100 Message-ID: <20250125165855.32168-2-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 Received-SPF: pass client-ip=2a00:1450:4864:20::434; envelope-from=philmd@linaro.org; helo=mail-wr1-x434.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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Since class_base_init() is called *before* class_init(), move its declaration in TypeInfo before class_init() to help a bit. No logical change. Signed-off-by: Philippe Mathieu-Daudé --- include/qom/object.h | 10 +++++----- qom/object.c | 4 ++-- rust/qemu-api/src/qom.rs | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/qom/object.h b/include/qom/object.h index 9192265db76..3776267e903 100644 --- a/include/qom/object.h +++ b/include/qom/object.h @@ -457,14 +457,14 @@ struct Object * assumed to be the size of the parent class. This allows a type to avoid * implementing an explicit class type if they are not adding additional * virtual functions. - * @class_init: This function is called after all parent class initialization - * has occurred to allow a class to set its default virtual method pointers. - * This is also the function to use to override virtual methods from a parent - * class. * @class_base_init: This function is called for all base classes after all * parent class initialization has occurred, but before the class itself * is initialized. This is the function to use to undo the effects of * memcpy from the parent class to the descendants. + * @class_init: This function is called after all parent class initialization + * has occurred to allow a class to set its default virtual method pointers. + * This is also the function to use to override virtual methods from a parent + * class. * @class_data: Data to pass to the @class_init, * @class_base_init. This can be useful when building dynamic * classes. @@ -486,8 +486,8 @@ struct TypeInfo bool abstract; size_t class_size; - void (*class_init)(ObjectClass *klass, void *data); void (*class_base_init)(ObjectClass *klass, void *data); + void (*class_init)(ObjectClass *klass, void *data); void *class_data; InterfaceInfo *interfaces; diff --git a/qom/object.c b/qom/object.c index ec447f14a78..1a686dff5a0 100644 --- a/qom/object.c +++ b/qom/object.c @@ -54,8 +54,8 @@ struct TypeImpl size_t instance_size; size_t instance_align; - void (*class_init)(ObjectClass *klass, void *data); void (*class_base_init)(ObjectClass *klass, void *data); + void (*class_init)(ObjectClass *klass, void *data); void *class_data; @@ -119,8 +119,8 @@ static TypeImpl *type_new(const TypeInfo *info) ti->instance_size = info->instance_size; ti->instance_align = info->instance_align; - ti->class_init = info->class_init; ti->class_base_init = info->class_base_init; + ti->class_init = info->class_init; ti->class_data = info->class_data; ti->instance_init = info->instance_init; diff --git a/rust/qemu-api/src/qom.rs b/rust/qemu-api/src/qom.rs index 97901fb9084..6033228e338 100644 --- a/rust/qemu-api/src/qom.rs +++ b/rust/qemu-api/src/qom.rs @@ -486,8 +486,8 @@ pub trait ObjectImpl: ObjectType + ClassInitImpl { instance_finalize: Some(drop_object::), abstract_: Self::ABSTRACT, class_size: core::mem::size_of::(), - class_init: Some(rust_class_init::), class_base_init: Self::CLASS_BASE_INIT, + class_init: Some(rust_class_init::), class_data: core::ptr::null_mut(), interfaces: core::ptr::null_mut(), };