From mboxrd@z Thu Jan 1 00:00:00 1970 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 B4596CED624 for ; Tue, 18 Nov 2025 12:22:26 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vLKiQ-0004qJ-As; Tue, 18 Nov 2025 07:21:46 -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 1vLKiO-0004nm-Vu for qemu-devel@nongnu.org; Tue, 18 Nov 2025 07:21:44 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vLKiN-0005GJ-9l for qemu-devel@nongnu.org; Tue, 18 Nov 2025 07:21:44 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1763468502; 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=ucK12I488dUYw8mNfYHMEcUYym2/DVuiuzBjV/gWqAk=; b=T2PvdPDrx1QyHix4H1c5hXHR1mfw/1EV1X7mHn8/8bOZc0dWce1pfsfwXlojXLEGlRj5ze iP8iu/E01fXtCDvFTXhT6sg9tH9/L4/mwj9iYOV/cN8a9nlptl2dPCVs4qZEyKwbyKYEfW WKAKUZnG4YTa3PAAF4C8Wqbc6Sh0z7M= Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-78-Tm33k3t2PyurEAk3I_ZMuw-1; Tue, 18 Nov 2025 07:21:38 -0500 X-MC-Unique: Tm33k3t2PyurEAk3I_ZMuw-1 X-Mimecast-MFC-AGG-ID: Tm33k3t2PyurEAk3I_ZMuw_1763468497 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 14F0918AB303; Tue, 18 Nov 2025 12:21:37 +0000 (UTC) Received: from sirius.home.kraxel.org (unknown [10.44.32.167]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id BF9293003754; Tue, 18 Nov 2025 12:21:35 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 60794182C025; Tue, 18 Nov 2025 13:21:33 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Cc: Gerd Hoffmann , Eduardo Habkost , Ani Sinha , Paolo Bonzini , Marcel Apfelbaum , Richard Henderson , Stefano Garzarella , Luigi Leonardi , Oliver Steffen , "Michael S. Tsirkin" Subject: [PATCH 1/4] igvm: make igvm-cfg object resetable Date: Tue, 18 Nov 2025 13:21:29 +0100 Message-ID: <20251118122133.1695767-2-kraxel@redhat.com> In-Reply-To: <20251118122133.1695767-1-kraxel@redhat.com> References: <20251118122133.1695767-1-kraxel@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 Received-SPF: pass client-ip=170.10.133.124; envelope-from=kraxel@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=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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Add TYPE_RESETTABLE_INTERFACE to interfaces. Register callbacks for the reset phases. Add trace points for logging and debugging. No functional change, that will come in followup patches. Signed-off-by: Gerd Hoffmann --- include/system/igvm-cfg.h | 2 ++ backends/igvm-cfg.c | 36 +++++++++++++++++++++++++++++++++++- backends/trace-events | 5 +++++ 3 files changed, 42 insertions(+), 1 deletion(-) diff --git a/include/system/igvm-cfg.h b/include/system/igvm-cfg.h index 944f23a814dd..312f77c092b0 100644 --- a/include/system/igvm-cfg.h +++ b/include/system/igvm-cfg.h @@ -13,6 +13,7 @@ #define QEMU_IGVM_CFG_H #include "qom/object.h" +#include "hw/resettable.h" typedef struct IgvmCfg { ObjectClass parent_class; @@ -23,6 +24,7 @@ typedef struct IgvmCfg { * format. */ char *filename; + ResettableState reset_state; } IgvmCfg; typedef struct IgvmCfgClass { diff --git a/backends/igvm-cfg.c b/backends/igvm-cfg.c index d00acf351249..4e3ef88ffc27 100644 --- a/backends/igvm-cfg.c +++ b/backends/igvm-cfg.c @@ -13,8 +13,11 @@ #include "system/igvm-cfg.h" #include "system/igvm.h" +#include "system/reset.h" #include "qom/object_interfaces.h" +#include "trace.h" + static char *get_igvm(Object *obj, Error **errp) { IgvmCfg *igvm = IGVM_CFG(obj); @@ -28,24 +31,55 @@ static void set_igvm(Object *obj, const char *value, Error **errp) igvm->filename = g_strdup(value); } +static ResettableState *igvm_reset_state(Object *obj) +{ + IgvmCfg *igvm = IGVM_CFG(obj); + return &igvm->reset_state; +} + +static void igvm_reset_enter(Object *obj, ResetType type) +{ + trace_igvm_reset_enter(type); +} + +static void igvm_reset_hold(Object *obj, ResetType type) +{ + trace_igvm_reset_hold(type); +} + +static void igvm_reset_exit(Object *obj, ResetType type) +{ + trace_igvm_reset_exit(type); +} + OBJECT_DEFINE_TYPE_WITH_INTERFACES(IgvmCfg, igvm_cfg, IGVM_CFG, OBJECT, - { TYPE_USER_CREATABLE }, { NULL }) + { TYPE_USER_CREATABLE }, + { TYPE_RESETTABLE_INTERFACE }, + { NULL }) static void igvm_cfg_class_init(ObjectClass *oc, const void *data) { IgvmCfgClass *igvmc = IGVM_CFG_CLASS(oc); + ResettableClass *rc = RESETTABLE_CLASS(oc); object_class_property_add_str(oc, "file", get_igvm, set_igvm); object_class_property_set_description(oc, "file", "Set the IGVM filename to use"); igvmc->process = qigvm_process_file; + + rc->get_state = igvm_reset_state; + rc->phases.enter = igvm_reset_enter; + rc->phases.hold = igvm_reset_hold; + rc->phases.exit = igvm_reset_exit; } static void igvm_cfg_init(Object *obj) { + qemu_register_resettable(obj); } static void igvm_cfg_finalize(Object *obj) { + qemu_unregister_resettable(obj); } diff --git a/backends/trace-events b/backends/trace-events index 56132d3fd22b..45ac46dc2454 100644 --- a/backends/trace-events +++ b/backends/trace-events @@ -21,3 +21,8 @@ iommufd_backend_free_id(int iommufd, uint32_t id, int ret) " iommufd=%d id=%d (% iommufd_backend_set_dirty(int iommufd, uint32_t hwpt_id, bool start, int ret) " iommufd=%d hwpt=%u enable=%d (%d)" iommufd_backend_get_dirty_bitmap(int iommufd, uint32_t hwpt_id, uint64_t iova, uint64_t size, uint64_t page_size, int ret) " iommufd=%d hwpt=%u iova=0x%"PRIx64" size=0x%"PRIx64" page_size=0x%"PRIx64" (%d)" iommufd_backend_invalidate_cache(int iommufd, uint32_t id, uint32_t data_type, uint32_t entry_len, uint32_t entry_num, uint32_t done_num, uint64_t data_ptr, int ret) " iommufd=%d id=%u data_type=%u entry_len=%u entry_num=%u done_num=%u data_ptr=0x%"PRIx64" (%d)" + +# igvm-cfg.c +igvm_reset_enter(int type) "type=%u" +igvm_reset_hold(int type) "type=%u" +igvm_reset_exit(int type) "type=%u" -- 2.51.1