From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37937) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zb6dX-0003VA-1V for qemu-devel@nongnu.org; Sun, 13 Sep 2015 08:44:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zb6dW-0008GB-0g for qemu-devel@nongnu.org; Sun, 13 Sep 2015 08:44:02 -0400 Received: from mx1.redhat.com ([209.132.183.28]:53135) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zb6dV-0008Fa-QX for qemu-devel@nongnu.org; Sun, 13 Sep 2015 08:44:01 -0400 From: Laszlo Ersek Date: Sun, 13 Sep 2015 14:43:37 +0200 Message-Id: <1442148227-17343-4-git-send-email-lersek@redhat.com> In-Reply-To: <1442148227-17343-1-git-send-email-lersek@redhat.com> References: <55F5647C.6030901@redhat.com> <1442148227-17343-1-git-send-email-lersek@redhat.com> Subject: [Qemu-devel] [PATCH FYI 03/13] hw/acpi: rename "AcpiBuildTables.table_data" to "main_blob" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gal Hammer , Paolo Bonzini , "Michael S. Tsirkin" , Shannon Zhao , Igor Mammedov The identifier "table_data" is used in wildly different name spaces and scopes, which makes it practically impossible to grep for uses of "AcpiBuildTables.table_data" specifically. Rename the field to "main_blob" (which is a unique identifier across the tree), and update all references with the help of the compiler. Cc: Paolo Bonzini Cc: Gal Hammer Cc: Igor Mammedov Cc: "Michael S. Tsirkin" Cc: Shannon Zhao Signed-off-by: Laszlo Ersek --- include/hw/acpi/aml-build.h | 2 +- hw/acpi/aml-build.c | 4 ++-- hw/arm/virt-acpi-build.c | 6 +++--- hw/i386/acpi-build.c | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/include/hw/acpi/aml-build.h b/include/hw/acpi/aml-build.h index e3afa13..7d89c40 100644 --- a/include/hw/acpi/aml-build.h +++ b/include/hw/acpi/aml-build.h @@ -151,7 +151,7 @@ typedef enum { typedef struct AcpiBuildTables { - GArray *table_data; + GArray *main_blob; GArray *rsdp; GArray *tcpalog; GArray *linker; diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c index 0d4b324..2c7d59d 100644 --- a/hw/acpi/aml-build.c +++ b/hw/acpi/aml-build.c @@ -1178,7 +1178,7 @@ void acpi_add_table(GArray *table_offsets, GArray *table_data) void acpi_build_tables_init(AcpiBuildTables *tables) { tables->rsdp = g_array_new(false, true /* clear */, 1); - tables->table_data = g_array_new(false, true /* clear */, 1); + tables->main_blob = g_array_new(false, true /* clear */, 1); tables->tcpalog = g_array_new(false, true /* clear */, 1); tables->linker = bios_linker_loader_init(); } @@ -1188,7 +1188,7 @@ void acpi_build_tables_cleanup(AcpiBuildTables *tables, bool mfre) void *linker_data = bios_linker_loader_cleanup(tables->linker); g_free(linker_data); g_array_free(tables->rsdp, true); - g_array_free(tables->table_data, true); + g_array_free(tables->main_blob, true); g_array_free(tables->tcpalog, mfre); } diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c index 9088248..fcbb2d7 100644 --- a/hw/arm/virt-acpi-build.c +++ b/hw/arm/virt-acpi-build.c @@ -552,7 +552,7 @@ void virt_acpi_build(VirtGuestInfo *guest_info, AcpiBuildTables *tables) GArray *table_offsets; unsigned dsdt, rsdt; VirtAcpiCpuInfo cpuinfo; - GArray *tables_blob = tables->table_data; + GArray *tables_blob = tables->main_blob; virt_acpi_get_cpu_info(&cpuinfo); @@ -631,7 +631,7 @@ static void virt_acpi_build_update(void *build_opaque, uint32_t offset) virt_acpi_build(build_state->guest_info, &tables); - acpi_ram_update(build_state->table_mr, tables.table_data); + acpi_ram_update(build_state->table_mr, tables.main_blob); acpi_ram_update(build_state->rsdp_mr, tables.rsdp); acpi_ram_update(build_state->linker_mr, tables.linker); @@ -685,7 +685,7 @@ void virt_acpi_setup(VirtGuestInfo *guest_info) virt_acpi_build(build_state->guest_info, &tables); /* Now expose it all to Guest */ - build_state->table_mr = acpi_add_rom_blob(build_state, tables.table_data, + build_state->table_mr = acpi_add_rom_blob(build_state, tables.main_blob, ACPI_BUILD_TABLE_FILE, ACPI_BUILD_TABLE_MAX_SIZE); assert(build_state->table_mr != NULL); diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index 95e0c65..2cd8891 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -1670,7 +1670,7 @@ void acpi_build(PcGuestInfo *guest_info, AcpiBuildTables *tables) PcPciInfo pci; uint8_t *u; size_t aml_len = 0; - GArray *tables_blob = tables->table_data; + GArray *tables_blob = tables->main_blob; acpi_get_cpu_info(&cpu); acpi_get_pm_info(&pm); @@ -1833,7 +1833,7 @@ static void acpi_build_update(void *build_opaque, uint32_t offset) acpi_build(build_state->guest_info, &tables); - acpi_ram_update(build_state->table_mr, tables.table_data); + acpi_ram_update(build_state->table_mr, tables.main_blob); if (build_state->rsdp) { memcpy(build_state->rsdp, tables.rsdp->data, acpi_data_len(tables.rsdp)); @@ -1899,7 +1899,7 @@ void acpi_setup(PcGuestInfo *guest_info) acpi_build(build_state->guest_info, &tables); /* Now expose it all to Guest */ - build_state->table_mr = acpi_add_rom_blob(build_state, tables.table_data, + build_state->table_mr = acpi_add_rom_blob(build_state, tables.main_blob, ACPI_BUILD_TABLE_FILE, ACPI_BUILD_TABLE_MAX_SIZE); assert(build_state->table_mr != NULL); -- 1.8.3.1