[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 09/11] hw/arm/virt-acpi-build: don't save VirtGuestI
From: |
Andrew Jones |
Subject: |
[Qemu-devel] [PATCH 09/11] hw/arm/virt-acpi-build: don't save VirtGuestInfo on AcpiBuildState |
Date: |
Tue, 13 Dec 2016 22:45:20 +0100 |
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 <address@hidden>
---
hw/arm/virt-acpi-build.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c
index 7a1efd0dc538..137781646bec 100644
--- a/hw/arm/virt-acpi-build.c
+++ b/hw/arm/virt-acpi-build.c
@@ -706,7 +706,6 @@ struct AcpiBuildState {
MemoryRegion *linker_mr;
/* Is table patched? */
bool patched;
- VirtGuestInfo *guest_info;
} AcpiBuildState;
static
@@ -779,6 +778,8 @@ static void acpi_ram_update(MemoryRegion *mr, GArray *data)
static void virt_acpi_build_update(void *build_opaque)
{
+ MachineState *machine = MACHINE(qdev_get_machine());
+ VirtMachineState *vms = VIRT_MACHINE(machine);
AcpiBuildState *build_state = build_opaque;
AcpiBuildTables tables;
@@ -790,8 +791,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(vms, &tables);
acpi_ram_update(build_state->table_mr, tables.table_data);
acpi_ram_update(build_state->rsdp_mr, tables.rsdp);
@@ -841,7 +841,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);
--
2.9.3
- [Qemu-devel] [PATCH 06/11] hw/arm/virt: move VirtMachineState/Class to virt.h, (continued)
- [Qemu-devel] [PATCH 06/11] hw/arm/virt: move VirtMachineState/Class to virt.h, Andrew Jones, 2016/12/13
- [Qemu-devel] [PATCH 07/11] hw/arm/virt: pass VirtMachineState instead of VirtGuestInfo, Andrew Jones, 2016/12/13
- [Qemu-devel] [PATCH 08/11] hw/arm/virt-acpi-build: remove redundant members from VirtGuestInfo, Andrew Jones, 2016/12/13
- [Qemu-devel] [PATCH 10/11] hw/arm/virt: remove VirtGuestInfo, Andrew Jones, 2016/12/13
- [Qemu-devel] [PATCH 09/11] hw/arm/virt-acpi-build: don't save VirtGuestInfo on AcpiBuildState,
Andrew Jones <=
- [Qemu-devel] [PATCH 11/11] hw/arm/virt-acpi-build: Don't incorrectly claim architectural timer to be edge-triggered, Andrew Jones, 2016/12/13
- Re: [Qemu-devel] [PATCH 00/11] Remove VirtGuestInfo, Michael S. Tsirkin, 2016/12/15