ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hw/arm/virt-acpi-build: don't save VirtGuestInfo on AcpiBuildState 

We can get to VirtMachineState without the need for saving a pointer
on AcpiBuildState. This is the mach-virt equivalent to "acpi: Don't save
PcGuestInfo on AcpiBuildState"

Signed-off-by: Andrew Jones <drjones@redhat.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Message-id: 20170102200153.28864-13-drjones@redhat.com
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Andrew Jones 2017-01-09 11:40:22 +00:00 committed by Peter Maydell
parent da4f09a7dc
commit 4dad9e7478
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hw/arm/virt-acpi-build.c
View File

@ -707,7 +707,6 @@ struct AcpiBuildState {
MemoryRegion *linker_mr; MemoryRegion *linker_mr;
/* Is table patched? */ /* Is table patched? */
bool patched; bool patched;
VirtGuestInfo *guest_info;
} AcpiBuildState; } AcpiBuildState;
static static
@ -791,8 +790,7 @@ static void virt_acpi_build_update(void *build_opaque)
acpi_build_tables_init(&tables); acpi_build_tables_init(&tables);
virt_acpi_build(container_of(build_state->guest_info, virt_acpi_build(VIRT_MACHINE(qdev_get_machine()), &tables);
VirtMachineState, acpi_guest_info), &tables);
acpi_ram_update(build_state->table_mr, tables.table_data); acpi_ram_update(build_state->table_mr, tables.table_data);
acpi_ram_update(build_state->rsdp_mr, tables.rsdp); acpi_ram_update(build_state->rsdp_mr, tables.rsdp);
@ -842,7 +840,6 @@ void virt_acpi_setup(VirtMachineState *vms)
} }
build_state = g_malloc0(sizeof *build_state); build_state = g_malloc0(sizeof *build_state);
build_state->guest_info = guest_info;
acpi_build_tables_init(&tables); acpi_build_tables_init(&tables);
virt_acpi_build(vms, &tables); virt_acpi_build(vms, &tables);