From nobody Thu Nov 20 14:05:12 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=1763468536; cv=none; d=zohomail.com; s=zohoarc; b=S8FYPGYDzGGNbt6r4G0/v38XdA8S6mLcxAs9Ya3lHlX21yE3p3ug5Uv7Y/XbUkBLK2+w0bc3K1TsDWKoPXqVVtL/wIunkugT5IWKlx8t58av0zNSTZxSYpZ+fRZLxuMDGNTDD7fXYjcxjhNNb59yKvQt+PQJBOjKHrFqnXxOSec= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1763468536; 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=pQivBRCSF6+GiWlSUjzSe5VG7ineUGQJlIEltid67L0=; b=SlBAoeaLkiHFYw2zn7eqZNyRG5ZizyDaMx2KM0IAgz7YvK44tmKKYHRnvHT0kqXpSpRmkxW6n7Nyk3QXYiyhDHkeMCqaRVENMhTwgjzthriH09uNXfeiUI9j/MjlWQCQh81ZMoUOFu47QHpg/yl0QAHYdnBRuC0hvOGKf6+F5vU= 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 1763468536777867.7049326941124; Tue, 18 Nov 2025 04:22:16 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vLKiU-0004u2-Ov; Tue, 18 Nov 2025 07:21:50 -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 1vLKiS-0004sE-1Q for qemu-devel@nongnu.org; Tue, 18 Nov 2025 07:21:48 -0500 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 1vLKiQ-0005IO-Hy for qemu-devel@nongnu.org; Tue, 18 Nov 2025 07:21:47 -0500 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-691-IDcom3MtNQmiuQqyN2YvLw-1; Tue, 18 Nov 2025 07:21:44 -0500 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (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 3C87E18D95D1; Tue, 18 Nov 2025 12:21:43 +0000 (UTC) Received: from sirius.home.kraxel.org (unknown [10.44.32.167]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id DC12019560B6; Tue, 18 Nov 2025 12:21:42 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id A0022182C029; Tue, 18 Nov 2025 13:21:33 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1763468505; 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=pQivBRCSF6+GiWlSUjzSe5VG7ineUGQJlIEltid67L0=; b=aL1ytjlmttvDh86NPOd5h4TBj2HOD5ZxgN/wx8Hid3eNv3eXWz/tF0LpxiEG6sl3ANXHo7 6dB0nji1N6F/RzZO1kDvRrvuV+3hTQCgNOD7u9ULp8iFrpPhbdGh5JSLS+zci8JpIix5wM fOSBpS1Qh8s+8Gwyt6Kn51YkxkauqCk= X-MC-Unique: IDcom3MtNQmiuQqyN2YvLw-1 X-Mimecast-MFC-AGG-ID: IDcom3MtNQmiuQqyN2YvLw_1763468503 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 4/4] igvm: move igvm file processing to reset callbacks Date: Tue, 18 Nov 2025 13:21:32 +0100 Message-ID: <20251118122133.1695767-5-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: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 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=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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1763468540264158500 Content-Type: text/plain; charset="utf-8" Move igvm file processing from machine init to reset callbacks. With that the igvm file is properly re-loaded on reset. Also the loading happens later in the init process now. This will simplify future support for some IGVM parameters which depend on initialization steps which happen after machine init. Signed-off-by: Gerd Hoffmann --- backends/igvm-cfg.c | 7 +++++++ hw/i386/pc_piix.c | 10 ---------- hw/i386/pc_q35.c | 10 ---------- 3 files changed, 7 insertions(+), 20 deletions(-) diff --git a/backends/igvm-cfg.c b/backends/igvm-cfg.c index 08501a67e58e..c1b45401f429 100644 --- a/backends/igvm-cfg.c +++ b/backends/igvm-cfg.c @@ -15,6 +15,8 @@ #include "system/igvm.h" #include "system/reset.h" #include "qom/object_interfaces.h" +#include "hw/qdev-core.h" +#include "hw/boards.h" =20 #include "trace.h" =20 @@ -44,7 +46,12 @@ static void igvm_reset_enter(Object *obj, ResetType type) =20 static void igvm_reset_hold(Object *obj, ResetType type) { + MachineState *ms =3D MACHINE(qdev_get_machine()); + IgvmCfg *igvm =3D IGVM_CFG(obj); + trace_igvm_reset_hold(type); + + qigvm_process_file(igvm, ms->cgs, false, &error_fatal); } =20 static void igvm_reset_exit(Object *obj, ResetType type) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 7b3611e973cd..b3b71df64bfc 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -320,16 +320,6 @@ static void pc_init1(MachineState *machine, const char= *pci_type) x86_nvdimm_acpi_dsmio, x86ms->fw_cfg, OBJECT(pcms)); } - -#if defined(CONFIG_IGVM) - /* Apply guest state from IGVM if supplied */ - if (x86ms->igvm) { - if (IGVM_CFG_GET_CLASS(x86ms->igvm) - ->process(x86ms->igvm, machine->cgs, false, &error_fatal) = < 0) { - g_assert_not_reached(); - } - } -#endif } =20 typedef enum PCSouthBridgeOption { diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 6015e639d7bc..f2e6ebfe294c 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -328,16 +328,6 @@ static void pc_q35_init(MachineState *machine) x86_nvdimm_acpi_dsmio, x86ms->fw_cfg, OBJECT(pcms)); } - -#if defined(CONFIG_IGVM) - /* Apply guest state from IGVM if supplied */ - if (x86ms->igvm) { - if (IGVM_CFG_GET_CLASS(x86ms->igvm) - ->process(x86ms->igvm, machine->cgs, false, &error_fatal) = < 0) { - g_assert_not_reached(); - } - } -#endif } =20 #define DEFINE_Q35_MACHINE(major, minor) \ --=20 2.51.1