From patchwork Fri Apr 3 10:18:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Shameerali Kolothum Thodi X-Patchwork-Id: 185169 Delivered-To: patch@linaro.org Received: by 2002:a92:de47:0:0:0:0:0 with SMTP id e7csp359488ilr; Fri, 3 Apr 2020 03:21:37 -0700 (PDT) X-Google-Smtp-Source: APiQypLZozh04oop2Yf6lwIznRWZoYeUD+i1cygvK4bHeqGOQEpv8Xn/NdoajB9j7BoYX82ytwv6 X-Received: by 2002:ac8:7299:: with SMTP id v25mr7526282qto.319.1585909296882; Fri, 03 Apr 2020 03:21:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1585909296; cv=none; d=google.com; s=arc-20160816; b=zhLYdkKCQrKUAITL6rZ3vZ4p6x5yzwq1M5ey53YL6P3fjPY4YKJBPYBc1yA2DSimJt Sq/JWL38A5BCDiCaKK2wdATFoTe+4aRSWurMD8JtvjQA+hZ15wLumf7CUQtaK+BnGi9p wpsrXaC08MzPBz05glF9XOJt2gHI1+bY3EwCwWsqtMhZVvJMV7xUw0bqy4K02ZDJfBei DfytanUG+HBqHLN5BRkDT8ZM6Tem8KmMOte+N5NA2TbHz7QsmYwbDLYASOzZyNYWC49n t73OGJkoqPy6R8sdfI5SaRZsMAr7rdQU2UU2YeiioSYnMnONotQUrLW8T2q4tmsKjBNt 5nmA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:mime-version:references :in-reply-to:message-id:date:subject:to:from; bh=03uQ+dj2JgryyO3ADbA5Mb9GveRHlXJTpyoD8u33LPY=; b=xqXfHk1PCmtqAyHwA+Id2wXYmDl8G/eEnVIqFtrcc8QSvAWz3thCOWJof+SSwqYf9U eIaLNfWkEcSi9ww6Tdsha5kO8vRzeUhYiMB/ZoqE1+1Tl1+6ksrZuSC7U55RwzEWSuBi VvzN2ctvSxeDdsp7AAdTznrKI9t65sVn7+OQnfoH2FGZYWAdEhWocrTxqQfVXzv8aAbf mF+5Qy57x84+EcLr4wZsoodmDUQeIwy1tTb34YCe9vu0ThkZrbv1Iq3df2Jp1LRZ/naC AIw8A9fMEpLd2niLt5FySnUSrTlSvvgtA84L2sLcW7kmu27CBaoPdCBsIxyU0U7UYnkw 8ZUQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id j187si5036509qkf.286.2020.04.03.03.21.36 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 03 Apr 2020 03:21:36 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Received: from localhost ([::1]:53262 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jKJSC-0006d6-CM for patch@linaro.org; Fri, 03 Apr 2020 06:21:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35877) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jKJQT-0003NQ-Uy for qemu-devel@nongnu.org; Fri, 03 Apr 2020 06:19:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jKJQS-0001rw-MN for qemu-devel@nongnu.org; Fri, 03 Apr 2020 06:19:49 -0400 Received: from szxga06-in.huawei.com ([45.249.212.32]:50350 helo=huawei.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jKJQQ-0001kF-7I; Fri, 03 Apr 2020 06:19:46 -0400 Received: from DGGEMS402-HUB.china.huawei.com (unknown [172.30.72.59]) by Forcepoint Email with ESMTP id 5692B4E3BDC0BABAAD09; Fri, 3 Apr 2020 18:19:39 +0800 (CST) Received: from S00345302A-PC.china.huawei.com (10.47.24.31) by DGGEMS402-HUB.china.huawei.com (10.3.19.202) with Microsoft SMTP Server id 14.3.487.0; Fri, 3 Apr 2020 18:19:32 +0800 From: Shameer Kolothum To: , , , Subject: [PATCH for-5.0 v2 1/3] acpi: Use macro for table-loader file name Date: Fri, 3 Apr 2020 11:18:25 +0100 Message-ID: <20200403101827.30664-2-shameerali.kolothum.thodi@huawei.com> X-Mailer: git-send-email 2.12.0.windows.1 In-Reply-To: <20200403101827.30664-1-shameerali.kolothum.thodi@huawei.com> References: <20200403101827.30664-1-shameerali.kolothum.thodi@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.47.24.31] X-CFilter-Loop: Reflected X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 45.249.212.32 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, xiaoguangrong.eric@gmail.com, david@redhat.com, mst@redhat.com, dgilbert@redhat.com, xuwei5@hisilicon.com, linuxarm@huawei.com, shannon.zhaosl@gmail.com, lersek@redhat.com Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Use macro for "etc/table-loader" and move it to the header file similar to ACPI_BUILD_TABLE_FILE/ACPI_BUILD_RSDP_FILE etc. Signed-off-by: Shameer Kolothum Reviewed-by: Igor Mammedov --- hw/arm/virt-acpi-build.c | 2 +- hw/i386/acpi-build.c | 2 +- include/hw/acpi/aml-build.h | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) -- 2.17.1 Reviewed-by: Philippe Mathieu-Daudé diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c index 7ef0733d71..81d41a3990 100644 --- a/hw/arm/virt-acpi-build.c +++ b/hw/arm/virt-acpi-build.c @@ -929,7 +929,7 @@ void virt_acpi_setup(VirtMachineState *vms) build_state->linker_mr = acpi_add_rom_blob(virt_acpi_build_update, build_state, - tables.linker->cmd_blob, "etc/table-loader", 0); + tables.linker->cmd_blob, ACPI_BUILD_LOADER_FILE, 0); fw_cfg_add_file(vms->fw_cfg, ACPI_BUILD_TPMLOG_FILE, tables.tcpalog->data, acpi_data_len(tables.tcpalog)); diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index 2a7e55bae7..23c77eeb95 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -3043,7 +3043,7 @@ void acpi_setup(void) build_state->linker_mr = acpi_add_rom_blob(acpi_build_update, build_state, - tables.linker->cmd_blob, "etc/table-loader", 0); + tables.linker->cmd_blob, ACPI_BUILD_LOADER_FILE, 0); fw_cfg_add_file(x86ms->fw_cfg, ACPI_BUILD_TPMLOG_FILE, tables.tcpalog->data, acpi_data_len(tables.tcpalog)); diff --git a/include/hw/acpi/aml-build.h b/include/hw/acpi/aml-build.h index de4a406568..0f4ed53d7f 100644 --- a/include/hw/acpi/aml-build.h +++ b/include/hw/acpi/aml-build.h @@ -13,6 +13,7 @@ #define ACPI_BUILD_TABLE_FILE "etc/acpi/tables" #define ACPI_BUILD_RSDP_FILE "etc/acpi/rsdp" #define ACPI_BUILD_TPMLOG_FILE "etc/tpm/log" +#define ACPI_BUILD_LOADER_FILE "etc/table-loader" #define AML_NOTIFY_METHOD "NTFY"