Signed-off-by: Eduardo Habkost <ehabk...@redhat.com> --- hw/i386/acpi-build.c | 6 +++--- hw/i386/pc.c | 8 ++++---- include/hw/i386/pc.h | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index 9f2129d..efc4151 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -1900,7 +1900,7 @@ void acpi_setup(PCMachineState *pcms) AcpiBuildTables tables; AcpiBuildState *build_state; - if (!guest_info->fw_cfg) { + if (!pcms->fw_cfg) { ACPI_BUILD_DPRINTF("No fw cfg. Bailing out.\n"); return; } @@ -1933,7 +1933,7 @@ void acpi_setup(PCMachineState *pcms) build_state->linker_mr = acpi_add_rom_blob(build_state, tables.linker, "etc/table-loader", 0); - fw_cfg_add_file(guest_info->fw_cfg, ACPI_BUILD_TPMLOG_FILE, + fw_cfg_add_file(pcms->fw_cfg, ACPI_BUILD_TPMLOG_FILE, tables.tcpalog->data, acpi_data_len(tables.tcpalog)); if (!guest_info->rsdp_in_ram) { @@ -1945,7 +1945,7 @@ void acpi_setup(PCMachineState *pcms) uint32_t rsdp_size = acpi_data_len(tables.rsdp); build_state->rsdp = g_memdup(tables.rsdp->data, rsdp_size); - fw_cfg_add_file_callback(guest_info->fw_cfg, ACPI_BUILD_RSDP_FILE, + fw_cfg_add_file_callback(pcms->fw_cfg, ACPI_BUILD_RSDP_FILE, acpi_build_update, build_state, build_state->rsdp, rsdp_size); build_state->rsdp_mr = NULL; diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 8687adb..a219187 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1171,10 +1171,10 @@ void pc_machine_done(Notifier *notifier, void *data) extra_hosts++; } } - if (extra_hosts && pcms->acpi_guest_info.fw_cfg) { + if (extra_hosts && pcms->fw_cfg) { uint64_t *val = g_malloc(sizeof(*val)); *val = cpu_to_le64(extra_hosts); - fw_cfg_add_file(pcms->acpi_guest_info.fw_cfg, + fw_cfg_add_file(pcms->fw_cfg, "etc/extra-pci-roots", val, sizeof(*val)); } } @@ -1270,7 +1270,7 @@ FWCfgState *xen_load_linux(PCMachineState *pcms, !strcmp(option_rom[i].name, "multiboot.bin")); rom_add_option(option_rom[i].name, option_rom[i].bootindex); } - guest_info->fw_cfg = fw_cfg; + pcms->fw_cfg = fw_cfg; return fw_cfg; } @@ -1400,7 +1400,7 @@ FWCfgState *pc_memory_init(PCMachineState *pcms, for (i = 0; i < nb_option_roms; i++) { rom_add_option(option_rom[i].name, option_rom[i].bootindex); } - guest_info->fw_cfg = fw_cfg; + pcms->fw_cfg = fw_cfg; return fw_cfg; } diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 6cb9ca8..03750bc 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -28,7 +28,6 @@ struct PcGuestInfo { uint64_t numa_nodes; uint64_t *node_mem; uint64_t *node_cpu; - FWCfgState *fw_cfg; int legacy_acpi_table_size; bool has_acpi_build; bool has_reserved_memory; @@ -56,6 +55,7 @@ struct PCMachineState { PCIBus *bus; PcGuestInfo acpi_guest_info; Notifier machine_done; + FWCfgState *fw_cfg; }; #define PC_MACHINE_ACPI_DEVICE_PROP "acpi-device" -- 2.1.0