[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 08/16] acpi: Make build_srat() get PCMachineState as
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PATCH 08/16] acpi: Make build_srat() get PCMachineState as argument |
Date: |
Tue, 1 Dec 2015 23:47:03 -0200 |
Some PCMachineState and PCMachineClass fields will be used by
build_srat().
Signed-off-by: Eduardo Habkost <address@hidden>
---
hw/i386/acpi-build.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index b1548e7..8841798 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -1453,8 +1453,9 @@ acpi_build_srat_memory(AcpiSratMemoryAffinity *numamem,
uint64_t base,
}
static void
-build_srat(GArray *table_data, GArray *linker, PcGuestInfo *guest_info)
+build_srat(GArray *table_data, GArray *linker, PCMachineState *pcms)
{
+ PcGuestInfo *guest_info = &pcms->acpi_guest_info;
AcpiSystemResourceAffinityTable *srat;
AcpiSratProcessorAffinity *core;
AcpiSratMemoryAffinity *numamem;
@@ -1463,7 +1464,6 @@ build_srat(GArray *table_data, GArray *linker,
PcGuestInfo *guest_info)
uint64_t curnode;
int srat_start, numa_start, slots;
uint64_t mem_len, mem_base, next_base;
- PCMachineState *pcms = PC_MACHINE(qdev_get_machine());
ram_addr_t hotplugabble_address_space_size =
object_property_get_int(OBJECT(pcms), PC_MACHINE_MEMHP_REGION_SIZE,
NULL);
@@ -1756,7 +1756,7 @@ void acpi_build(PCMachineState *pcms, AcpiBuildTables
*tables)
}
if (guest_info->numa_nodes) {
acpi_add_table(table_offsets, tables_blob);
- build_srat(tables_blob, tables->linker, guest_info);
+ build_srat(tables_blob, tables->linker, pcms);
}
if (acpi_get_mcfg(&mcfg)) {
acpi_add_table(table_offsets, tables_blob);
--
2.1.0
- Re: [Qemu-devel] [PATCH 04/16] acpi: Make acpi_setup() get PCMachineState as argument, (continued)
[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 <=
[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
[Qemu-devel] [PATCH 12/16] pc: Remove PcGuestInfo.isapc_ram_fw field, Eduardo Habkost, 2015/12/01
[Qemu-devel] [PATCH 13/16] q35: Remove MCHPCIState.guest_info field, Eduardo Habkost, 2015/12/01
[Qemu-devel] [PATCH 14/16] acpi: Use PCMachineClass fields directly, Eduardo Habkost, 2015/12/01
[Qemu-devel] [PATCH 15/16] pc: Move PcGuestInfo.apic_xrupt_override field to PCMachineState, Eduardo Habkost, 2015/12/01
[Qemu-devel] [PATCH 16/16] pc: Move APIC and NUMA data from PcGuestInfo to PCMachineState, Eduardo Habkost, 2015/12/01
Re: [Qemu-devel] [PATCH 00/16] pc: Eliminate struct PcGuestInfo, Marcel Apfelbaum, 2015/12/07