diff options
| author | Andrew Jones <drjones@redhat.com> | 2017-01-09 11:40:22 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-01-09 11:40:22 +0000 |
| commit | 4dad9e7478ec9614f7c1cbe2ff5c5f5101acd6e2 (patch) | |
| tree | 06064ea5a50dc3aa7201bd83f85bbf1cada99452 | |
| parent | da4f09a7dce6878b6fd27a0fb70d08701551df17 (diff) | |
| download | qemu-4dad9e7478ec9614f7c1cbe2ff5c5f5101acd6e2.zip qemu-4dad9e7478ec9614f7c1cbe2ff5c5f5101acd6e2.tar.gz qemu-4dad9e7478ec9614f7c1cbe2ff5c5f5101acd6e2.tar.bz2 | |
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>
| -rw-r--r-- | hw/arm/virt-acpi-build.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c index a3848a9..3791b81 100644 --- a/hw/arm/virt-acpi-build.c +++ b/hw/arm/virt-acpi-build.c @@ -707,7 +707,6 @@ struct AcpiBuildState { MemoryRegion *linker_mr; /* Is table patched? */ bool patched; - VirtGuestInfo *guest_info; } AcpiBuildState; static @@ -791,8 +790,7 @@ static void virt_acpi_build_update(void *build_opaque) acpi_build_tables_init(&tables); - virt_acpi_build(container_of(build_state->guest_info, - VirtMachineState, acpi_guest_info), &tables); + virt_acpi_build(VIRT_MACHINE(qdev_get_machine()), &tables); acpi_ram_update(build_state->table_mr, tables.table_data); 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->guest_info = guest_info; acpi_build_tables_init(&tables); virt_acpi_build(vms, &tables); |