[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 17/37] i386, acpi: remove mcfg_ prefix in AcpiMcfgInf
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 17/37] i386, acpi: remove mcfg_ prefix in AcpiMcfgInfo members |
Date: |
Thu, 16 May 2019 08:19:25 -0400 |
From: Wei Yang <address@hidden>
This is obvious the member in AcpiMcfgInfo describe MCFG's property.
Remove the mcfg_ prefix.
Signed-off-by: Wei Yang <address@hidden>
Suggested-by: Igor Mammedov <address@hidden>
Reviewed-by: Igor Mammedov <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
hw/i386/acpi-build.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index 8671e25af4..6df7bb3abc 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -87,8 +87,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 {
@@ -2404,11 +2404,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);
}
@@ -2577,15 +2577,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;
}
--
MST
- [Qemu-devel] [PULL 07/37] vhost-user-blk: Only start vhost-user backend with the first kick, (continued)
- [Qemu-devel] [PULL 07/37] vhost-user-blk: Only start vhost-user backend with the first kick, Michael S. Tsirkin, 2019/05/16
- [Qemu-devel] [PULL 08/37] vhost-user-blk: Add return value for vhost_user_blk_start(), Michael S. Tsirkin, 2019/05/16
- [Qemu-devel] [PULL 09/37] vhost-user-blk: Add support to reconnect backend, Michael S. Tsirkin, 2019/05/16
- [Qemu-devel] [PULL 10/37] contrib/vhost-user-blk: enable inflight I/O tracking, Michael S. Tsirkin, 2019/05/16
- [Qemu-devel] [PULL 11/37] acpi/piix4: Convert debug printf()s to trace events, Michael S. Tsirkin, 2019/05/16
- [Qemu-devel] [PULL 12/37] acpi/pcihp: Convert debug printf()s to trace events, Michael S. Tsirkin, 2019/05/16
- [Qemu-devel] [PULL 13/37] acpi/pcihp: Add a few more trace points related to unplug, Michael S. Tsirkin, 2019/05/16
- [Qemu-devel] [PULL 14/37] q35: acpi: do not create dummy MCFG table, Michael S. Tsirkin, 2019/05/16
- [Qemu-devel] [PULL 15/37] do not call vhost_net_cleanup() on running net from char user event, Michael S. Tsirkin, 2019/05/16
- [Qemu-devel] [PULL 16/37] hw/arm/virt-acpi-build: remove unnecessary variable mcfg_start, Michael S. Tsirkin, 2019/05/16
- [Qemu-devel] [PULL 17/37] i386, acpi: remove mcfg_ prefix in AcpiMcfgInfo members,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 18/37] hw/arm/virt-acpi-build: pass AcpiMcfgInfo to build_mcfg(), Michael S. Tsirkin, 2019/05/16
- [Qemu-devel] [PULL 19/37] hw/acpi: Consolidate build_mcfg to pci.c, Michael S. Tsirkin, 2019/05/16
- [Qemu-devel] [PULL 20/37] libvhost-user: fix bad vu_log_write, Michael S. Tsirkin, 2019/05/16
- [Qemu-devel] [PULL 21/37] pcie: Remove redundant test in pcie_mmcfg_data_{read, write}(), Michael S. Tsirkin, 2019/05/16
- [Qemu-devel] [PULL 22/37] pci: Simplify pci_bus_is_root(), Michael S. Tsirkin, 2019/05/16
- Re: [Qemu-devel] [PULL 00/37] pci, pc, virtio: features, fixes, Peter Maydell, 2019/05/16