Message ID | 20190415070307.13668-2-richardw.yang@linux.intel.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | Extract build_mcfg | expand |
On 4/15/19 9:03 AM, Wei Yang wrote: > mcfg_start points to the start of MCFG table and is used in > build_header. While this information could be derived from mcfg. > > This patch removes the unnecessary variable mcfg_start. > > Signed-off-by: Wei Yang <richardw.yang@linux.intel.com> > Reviewed-by: Igor Mammedov <imammedo@redhat.com> > --- > hw/arm/virt-acpi-build.c | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > > diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c > index 857989362a..e09e7eff8d 100644 > --- a/hw/arm/virt-acpi-build.c > +++ b/hw/arm/virt-acpi-build.c > @@ -552,7 +552,6 @@ build_mcfg(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) > const MemMapEntry *memmap = vms->memmap; > int ecam_id = VIRT_ECAM_ID(vms->highmem_ecam); > int len = sizeof(*mcfg) + sizeof(mcfg->allocation[0]); > - int mcfg_start = table_data->len; > > mcfg = acpi_data_push(table_data, len); > mcfg->allocation[0].address = cpu_to_le64(memmap[ecam_id].base); > @@ -563,8 +562,7 @@ build_mcfg(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) > mcfg->allocation[0].end_bus_number = > PCIE_MMCFG_BUS(memmap[ecam_id].size - 1); > > - build_header(linker, table_data, (void *)(table_data->data + mcfg_start), > - "MCFG", table_data->len - mcfg_start, 1, NULL, NULL); > + build_header(linker, table_data, (void *)mcfg, "MCFG", len, 1, NULL, NULL); > } > > /* GTDT */ > Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c index 857989362a..e09e7eff8d 100644 --- a/hw/arm/virt-acpi-build.c +++ b/hw/arm/virt-acpi-build.c @@ -552,7 +552,6 @@ build_mcfg(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) const MemMapEntry *memmap = vms->memmap; int ecam_id = VIRT_ECAM_ID(vms->highmem_ecam); int len = sizeof(*mcfg) + sizeof(mcfg->allocation[0]); - int mcfg_start = table_data->len; mcfg = acpi_data_push(table_data, len); mcfg->allocation[0].address = cpu_to_le64(memmap[ecam_id].base); @@ -563,8 +562,7 @@ build_mcfg(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) mcfg->allocation[0].end_bus_number = PCIE_MMCFG_BUS(memmap[ecam_id].size - 1); - build_header(linker, table_data, (void *)(table_data->data + mcfg_start), - "MCFG", table_data->len - mcfg_start, 1, NULL, NULL); + build_header(linker, table_data, (void *)mcfg, "MCFG", len, 1, NULL, NULL); } /* GTDT */