Commit c309434e authored by Wei Yang's avatar Wei Yang Committed by Michael S. Tsirkin
Browse files

i386, acpi: remove mcfg_ prefix in AcpiMcfgInfo members 



This is obvious the member in AcpiMcfgInfo describe MCFG's property.

Remove the mcfg_ prefix.

Signed-off-by: default avatarWei Yang <richardw.yang@linux.intel.com>
Suggested-by: default avatarIgor Mammedov <imammedo@redhat.com>
Reviewed-by: default avatarIgor Mammedov <imammedo@redhat.com>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20190419003053.8260-4-richardw.yang@linux.intel.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent ccf0f0f2

hw/i386/acpi-build.c

+7 −7
Original line number Diff line number Diff line
@@ -88,8 +88,8 @@ 
#define ACPI_BUILD_IOAPIC_ID 0x0



typedef struct AcpiMcfgInfo {

    uint64_t mcfg_base;

    uint32_t mcfg_size;

    uint64_t base;

    uint32_t size;

} AcpiMcfgInfo;



typedef struct AcpiPmInfo {
@@ -2416,11 +2416,11 @@ build_mcfg_q35(GArray *table_data, BIOSLinker *linker, AcpiMcfgInfo *info) 
    int len = sizeof(*mcfg) + 1 * sizeof(mcfg->allocation[0]);



    mcfg = acpi_data_push(table_data, len);

    mcfg->allocation[0].address = cpu_to_le64(info->mcfg_base);

    mcfg->allocation[0].address = cpu_to_le64(info->base);

    /* Only a single allocation so no need to play with segments */

    mcfg->allocation[0].pci_segment = cpu_to_le16(0);

    mcfg->allocation[0].start_bus_number = 0;

    mcfg->allocation[0].end_bus_number = PCIE_MMCFG_BUS(info->mcfg_size - 1);

    mcfg->allocation[0].end_bus_number = PCIE_MMCFG_BUS(info->size - 1);



    build_header(linker, table_data, (void *)mcfg, "MCFG", len, 1, NULL, NULL);

}
@@ -2589,15 +2589,15 @@ static bool acpi_get_mcfg(AcpiMcfgInfo *mcfg) 
    if (!o) {

        return false;

    }

    mcfg->mcfg_base = qnum_get_uint(qobject_to(QNum, o));

    mcfg->base = qnum_get_uint(qobject_to(QNum, o));

    qobject_unref(o);

    if (mcfg->mcfg_base == PCIE_BASE_ADDR_UNMAPPED) {

    if (mcfg->base == PCIE_BASE_ADDR_UNMAPPED) {

        return false;

    }



    o = object_property_get_qobject(pci_host, PCIE_HOST_MCFG_SIZE, NULL);

    assert(o);

    mcfg->mcfg_size = qnum_get_uint(qobject_to(QNum, o));

    mcfg->size = qnum_get_uint(qobject_to(QNum, o));

    qobject_unref(o);

    return true;

}