From patchwork Sun Sep 13 12:43:37 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laszlo Ersek X-Patchwork-Id: 53526 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f199.google.com (mail-lb0-f199.google.com [209.85.217.199]) by patches.linaro.org (Postfix) with ESMTPS id 9EA2122B26 for ; Sun, 13 Sep 2015 12:47:02 +0000 (UTC) Received: by lbbmp1 with SMTP id mp1sf37528016lbb.2 for ; Sun, 13 Sep 2015 05:47:01 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:date :message-id:in-reply-to:references:cc:subject:precedence:list-id :list-unsubscribe:list-archive:list-post:list-help:list-subscribe :errors-to:sender:x-original-sender :x-original-authentication-results:mailing-list; bh=pibiD81bZ/xZoVXGLAzfB1jkHnczuOGJmqF7S9OzY0o=; b=VbArfTYPGOl9fV2UpWByist7q+x8B5q/DpY/CDzHHheLQpWzgg2gp7xNXh+MGKOZ4K O+FaC8mXkUEOKuLZVPWub/PLkfSRijDyMZDCYRN6MQ8CNVpsjPHrZU1f+tilYzAVmI9u KC3Ok5ve9y2a2njEL87nBpdUtfzNSWY0ZzC7ITzxDouJ3HctcegMf90GED2gQRKMzFTa +r3WnZsculWtodtaBKNTlYJ0wbMlbBCG1K9UMpr/sau/a99E0FvB+LdzPG3cIgKH6ai9 MmG0f4ILofQGHq9hxXjMsKmKU9D3+M2UYgz13HoYBi9U3W/Y05wFQYzU2A/n9jl0SjXB nWPw== X-Gm-Message-State: ALoCoQmEku0oV34zhL+LbS/6riDs4sqKOpAdSGfGwXEez0h+LWCnUkmKif7u5+mht0PdFMijXw+A X-Received: by 10.112.145.3 with SMTP id sq3mr42007lbb.7.1442148421551; Sun, 13 Sep 2015 05:47:01 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.25.227 with SMTP id f3ls537766lag.81.gmail; Sun, 13 Sep 2015 05:47:01 -0700 (PDT) X-Received: by 10.112.137.40 with SMTP id qf8mr8230348lbb.107.1442148421094; Sun, 13 Sep 2015 05:47:01 -0700 (PDT) Received: from mail-la0-f44.google.com (mail-la0-f44.google.com. [209.85.215.44]) by mx.google.com with ESMTPS id dv2si6417981lac.156.2015.09.13.05.47.01 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 13 Sep 2015 05:47:01 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.44 as permitted sender) client-ip=209.85.215.44; Received: by lamp12 with SMTP id p12so71316783lam.0 for ; Sun, 13 Sep 2015 05:47:01 -0700 (PDT) X-Received: by 10.112.169.66 with SMTP id ac2mr8638880lbc.32.1442148420949; Sun, 13 Sep 2015 05:47:00 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.59.35 with SMTP id w3csp701403lbq; Sun, 13 Sep 2015 05:47:00 -0700 (PDT) X-Received: by 10.107.10.140 with SMTP id 12mr17409001iok.160.1442148420037; Sun, 13 Sep 2015 05:47:00 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [208.118.235.17]) by mx.google.com with ESMTPS id q6si4915998igr.43.2015.09.13.05.46.59 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Sun, 13 Sep 2015 05:47:00 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; Received: from localhost ([::1]:35742 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zb6gN-0007rS-EY for patch@linaro.org; Sun, 13 Sep 2015 08:46:59 -0400 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 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (Postfix) with ESMTPS id 81834C0B918D; Sun, 13 Sep 2015 12:44:01 +0000 (UTC) Received: from lacos-laptop-7.usersys.redhat.com (ovpn-116-23.ams2.redhat.com [10.36.116.23]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t8DChnOt024712; Sun, 13 Sep 2015 08:43:58 -0400 From: Laszlo Ersek To: qemu-devel@nongnu.org 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> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Gal Hammer , Paolo Bonzini , "Michael S. Tsirkin" , Shannon Zhao , Igor Mammedov Subject: [Qemu-devel] [PATCH FYI 03/13] hw/acpi: rename "AcpiBuildTables.table_data" to "main_blob" X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: lersek@redhat.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.44 as permitted sender) smtp.mailfrom=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 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);