[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 06/16] acpi: Save PCMachineState on AcpiBuildState
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PATCH 06/16] acpi: Save PCMachineState on AcpiBuildState |
Date: |
Tue, 1 Dec 2015 23:47:01 -0200 |
PCMachineState will be used in some of the steps of ACPI table
building.
Signed-off-by: Eduardo Habkost <address@hidden>
---
hw/i386/acpi-build.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index 85a5c53..ca11c88 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -1644,7 +1644,7 @@ struct AcpiBuildState {
MemoryRegion *table_mr;
/* Is table patched? */
uint8_t patched;
- PcGuestInfo *guest_info;
+ PCMachineState *pcms;
void *rsdp;
MemoryRegion *rsdp_mr;
MemoryRegion *linker_mr;
@@ -1855,7 +1855,7 @@ static void acpi_build_update(void *build_opaque,
uint32_t offset)
acpi_build_tables_init(&tables);
- acpi_build(build_state->guest_info, &tables);
+ acpi_build(&build_state->pcms->acpi_guest_info, &tables);
acpi_ram_update(build_state->table_mr, tables.table_data);
@@ -1916,12 +1916,12 @@ void acpi_setup(PCMachineState *pcms)
build_state = g_malloc0(sizeof *build_state);
- build_state->guest_info = guest_info;
+ build_state->pcms = pcms;
acpi_set_pci_info();
acpi_build_tables_init(&tables);
- acpi_build(build_state->guest_info, &tables);
+ acpi_build(&build_state->pcms->acpi_guest_info, &tables);
/* Now expose it all to Guest */
build_state->table_mr = acpi_add_rom_blob(build_state, tables.table_data,
--
2.1.0
- [Qemu-devel] [PATCH 00/16] pc: Eliminate struct PcGuestInfo, Eduardo Habkost, 2015/12/01
- [Qemu-devel] [PATCH 01/16] pc: Move PcGuestInfo declaration to top of file, Eduardo Habkost, 2015/12/01
- [Qemu-devel] [PATCH 02/16] pc: Eliminate struct PcGuestInfoState, Eduardo Habkost, 2015/12/01
- [Qemu-devel] [PATCH 03/16] pc: Remove guest_info parameter from pc_memory_init(), Eduardo Habkost, 2015/12/01
- [Qemu-devel] [PATCH 05/16] acpi: Remove unused build_facs() PcGuestInfo paramter, Eduardo Habkost, 2015/12/01
- [Qemu-devel] [PATCH 04/16] acpi: Make acpi_setup() get PCMachineState as argument, Eduardo Habkost, 2015/12/01
- [Qemu-devel] [PATCH 06/16] acpi: Save PCMachineState on AcpiBuildState,
Eduardo Habkost <=
[Qemu-devel] [PATCH 07/16] acpi: Make acpi_build() get PCMachineState as argument, Eduardo Habkost, 2015/12/01
[Qemu-devel] [PATCH 09/16] acpi: Remove ram size fields fron PcGuestInfo, Eduardo Habkost, 2015/12/01
[Qemu-devel] [PATCH 08/16] acpi: Make build_srat() get PCMachineState as argument, Eduardo Habkost, 2015/12/01
[Qemu-devel] [PATCH 10/16] pc: Move PcGuestInfo.fw_cfg field to PCMachineState, Eduardo Habkost, 2015/12/01
[Qemu-devel] [PATCH 11/16] pc: Simplify signature of xen_load_linux(), Eduardo Habkost, 2015/12/01