| Message ID | 1454586455-10202-3-git-send-email-imammedo@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 02/04/2016 01:47 PM, Igor Mammedov wrote: > call qdev_get_machine() once at acpi_build() and > pass its result to child functions that need it. > > Signed-off-by: Igor Mammedov <imammedo@redhat.com> > --- > Later it will also allow to reduce number of arguments > passed around by build_foo() functions called from > acpi_build() once guest_info fields are moved into > PCMachineState. > --- > hw/i386/acpi-build.c | 20 +++++++++++--------- > 1 file changed, 11 insertions(+), 9 deletions(-) > > diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c > index 2028ed7..faf541c 100644 > --- a/hw/i386/acpi-build.c > +++ b/hw/i386/acpi-build.c > @@ -1937,13 +1937,13 @@ static Aml *build_q35_osc_method(void) > static void > build_dsdt(GArray *table_data, GArray *linker, > AcpiCpuInfo *cpu, AcpiPmInfo *pm, AcpiMiscInfo *misc, > - PcPciInfo *pci, PcGuestInfo *guest_info) > + PcPciInfo *pci, PcGuestInfo *guest_info, > + MachineState *machine) > { > CrsRangeEntry *entry; > Aml *dsdt, *sb_scope, *scope, *dev, *method, *field, *pkg, *crs; > GPtrArray *mem_ranges = g_ptr_array_new_with_free_func(crs_range_free); > GPtrArray *io_ranges = g_ptr_array_new_with_free_func(crs_range_free); > - MachineState *machine = MACHINE(qdev_get_machine()); > uint32_t nr_mem = machine->ram_slots; > int root_bus_limit = 0xFF; > PCIBus *bus = NULL; > @@ -2365,7 +2365,8 @@ 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, PcGuestInfo *guest_info, > + MachineState *machine) > { > AcpiSystemResourceAffinityTable *srat; > AcpiSratProcessorAffinity *core; > @@ -2375,7 +2376,7 @@ 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()); > + PCMachineState *pcms = PC_MACHINE(machine); > ram_addr_t hotplugabble_address_space_size = > object_property_get_int(OBJECT(pcms), PC_MACHINE_MEMHP_REGION_SIZE, > NULL); > @@ -2579,9 +2580,9 @@ static bool acpi_has_iommu(void) > return intel_iommu && !ambiguous; > } > > -static bool acpi_has_nvdimm(void) > +static bool acpi_has_nvdimm(MachineState *machine) > { > - PCMachineState *pcms = PC_MACHINE(qdev_get_machine()); > + PCMachineState *pcms = PC_MACHINE(machine); > > return pcms->nvdimm; > } > @@ -2599,6 +2600,7 @@ void acpi_build(PcGuestInfo *guest_info, AcpiBuildTables *tables) > uint8_t *u; > size_t aml_len = 0; > GArray *tables_blob = tables->table_data; > + MachineState *machine = MACHINE(qdev_get_machine()); > > acpi_get_cpu_info(&cpu); > acpi_get_pm_info(&pm); > @@ -2624,7 +2626,7 @@ void acpi_build(PcGuestInfo *guest_info, AcpiBuildTables *tables) > /* DSDT is pointed to by FADT */ > dsdt = tables_blob->len; > build_dsdt(tables_blob, tables->linker, &cpu, &pm, &misc, &pci, > - guest_info); > + guest_info, machine); > > /* Count the size of the DSDT and SSDT, we will need it for legacy > * sizing of ACPI tables. > @@ -2655,7 +2657,7 @@ void acpi_build(PcGuestInfo *guest_info, 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, guest_info, machine); > } > if (acpi_get_mcfg(&mcfg)) { > acpi_add_table(table_offsets, tables_blob); > @@ -2666,7 +2668,7 @@ void acpi_build(PcGuestInfo *guest_info, AcpiBuildTables *tables) > build_dmar_q35(tables_blob, tables->linker); > } > > - if (acpi_has_nvdimm()) { > + if (acpi_has_nvdimm(machine)) { > nvdimm_build_acpi(table_offsets, tables_blob, tables->linker); > } > > I like the approach to pass the machine as parameter instead of querying it when the caller has already a reference to the machine. Reviewed-by: Marcel Apfelbaum <marcel@redhat.com> Thanks, Marcel
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index 2028ed7..faf541c 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -1937,13 +1937,13 @@ static Aml *build_q35_osc_method(void) static void build_dsdt(GArray *table_data, GArray *linker, AcpiCpuInfo *cpu, AcpiPmInfo *pm, AcpiMiscInfo *misc, - PcPciInfo *pci, PcGuestInfo *guest_info) + PcPciInfo *pci, PcGuestInfo *guest_info, + MachineState *machine) { CrsRangeEntry *entry; Aml *dsdt, *sb_scope, *scope, *dev, *method, *field, *pkg, *crs; GPtrArray *mem_ranges = g_ptr_array_new_with_free_func(crs_range_free); GPtrArray *io_ranges = g_ptr_array_new_with_free_func(crs_range_free); - MachineState *machine = MACHINE(qdev_get_machine()); uint32_t nr_mem = machine->ram_slots; int root_bus_limit = 0xFF; PCIBus *bus = NULL; @@ -2365,7 +2365,8 @@ 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, PcGuestInfo *guest_info, + MachineState *machine) { AcpiSystemResourceAffinityTable *srat; AcpiSratProcessorAffinity *core; @@ -2375,7 +2376,7 @@ 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()); + PCMachineState *pcms = PC_MACHINE(machine); ram_addr_t hotplugabble_address_space_size = object_property_get_int(OBJECT(pcms), PC_MACHINE_MEMHP_REGION_SIZE, NULL); @@ -2579,9 +2580,9 @@ static bool acpi_has_iommu(void) return intel_iommu && !ambiguous; } -static bool acpi_has_nvdimm(void) +static bool acpi_has_nvdimm(MachineState *machine) { - PCMachineState *pcms = PC_MACHINE(qdev_get_machine()); + PCMachineState *pcms = PC_MACHINE(machine); return pcms->nvdimm; } @@ -2599,6 +2600,7 @@ void acpi_build(PcGuestInfo *guest_info, AcpiBuildTables *tables) uint8_t *u; size_t aml_len = 0; GArray *tables_blob = tables->table_data; + MachineState *machine = MACHINE(qdev_get_machine()); acpi_get_cpu_info(&cpu); acpi_get_pm_info(&pm); @@ -2624,7 +2626,7 @@ void acpi_build(PcGuestInfo *guest_info, AcpiBuildTables *tables) /* DSDT is pointed to by FADT */ dsdt = tables_blob->len; build_dsdt(tables_blob, tables->linker, &cpu, &pm, &misc, &pci, - guest_info); + guest_info, machine); /* Count the size of the DSDT and SSDT, we will need it for legacy * sizing of ACPI tables. @@ -2655,7 +2657,7 @@ void acpi_build(PcGuestInfo *guest_info, 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, guest_info, machine); } if (acpi_get_mcfg(&mcfg)) { acpi_add_table(table_offsets, tables_blob); @@ -2666,7 +2668,7 @@ void acpi_build(PcGuestInfo *guest_info, AcpiBuildTables *tables) build_dmar_q35(tables_blob, tables->linker); } - if (acpi_has_nvdimm()) { + if (acpi_has_nvdimm(machine)) { nvdimm_build_acpi(table_offsets, tables_blob, tables->linker); }
call qdev_get_machine() once at acpi_build() and pass its result to child functions that need it. Signed-off-by: Igor Mammedov <imammedo@redhat.com> --- Later it will also allow to reduce number of arguments passed around by build_foo() functions called from acpi_build() once guest_info fields are moved into PCMachineState. --- hw/i386/acpi-build.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-)