starred/qemu-qemu-1
1
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2026-02-04 02:24:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

igvm: move igvm file processing to reset callbacks

Browse Source 
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.

Reviewed-by: Ani Sinha <anisinha@redhat.com>
Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Message-ID: <20260126123755.357378-6-kraxel@redhat.com>
This commit is contained in:
Gerd Hoffmann
2026-01-26 13:37:55 +01:00
parent 9d0880cf39
commit d5266c4740
3 changed files with 7 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
backends/igvm-cfg.c
View File

@@ -16,6 +16,8 @@
#include "system/igvm-internal.h"
#include "system/reset.h"
#include "qom/object_interfaces.h"
#include "hw/core/qdev.h"
#include "hw/core/boards.h"
#include "trace.h"
@@ -45,7 +47,12 @@ static void igvm_reset_enter(Object *obj, ResetType type)
static void igvm_reset_hold(Object *obj, ResetType type)
{
MachineState *ms = MACHINE(qdev_get_machine());
IgvmCfg *igvm = IGVM_CFG(obj);
trace_igvm_reset_hold(type);
qigvm_process_file(igvm, ms->cgs, false, &error_fatal);
}
static void igvm_reset_exit(Object *obj, ResetType type)

10
hw/i386/pc_piix.c
View File

@@ -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
}
typedef enum PCSouthBridgeOption {

10
hw/i386/pc_q35.c
View File

@@ -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
}
#define DEFINE_Q35_MACHINE(major, minor) \