From patchwork Wed Mar 11 17:20:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shameerali Kolothum Thodi X-Patchwork-Id: 184411 Delivered-To: patch@linaro.org Received: by 2002:a92:1f12:0:0:0:0:0 with SMTP id i18csp873090ile; Wed, 11 Mar 2020 10:24:58 -0700 (PDT) X-Google-Smtp-Source: ADFU+vt/Abrm60KOVQdCsM3WgdmjVd4cKgj4/rT2yJg32psARXd3z5AcVpLVpRkzKXwWsPTTF7oC X-Received: by 2002:a05:620a:55b:: with SMTP id o27mr2181336qko.291.1583947498064; Wed, 11 Mar 2020 10:24:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1583947498; cv=none; d=google.com; s=arc-20160816; b=E2cOwqKfJ2nd+3RXdspWZDnO5rPSwAnOkAVrzOkHmv9z0c4cR/3LPCA8pZdfIu4VAg Yjfr2xy/VIpqBjqzZ0OV+SSrp02UuTn3VnjZU9udSteh841nEo5aZko11xBIybYdXqMd eb1m2gDxTcOJ2OahQw8k7hjELXVdb/apeJJCBbf9GUZh3Oc/x+rEIU+Ayq7fQQ1moMp0 MvdoaQNNglTDtodxWNaf5ZE36cDG5L4OjUQY8BXmgOqtn4LPudpUuOz+DPpQYz1wMvfV +6eA87hg08lUDTlTxgDWYIQJ5MjwBZIAvqf77k0/klBdg0gAwF4fr95mMDmnHNuTltso UFEQ== 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=IrZ3juTJjhKOHh+8QdnWcI2Vi61j1C4xGfE1L8PWVO8=; b=TL5Fp2GN8zGo4aO7UzdnSYlwxoMBBf2qzwUP4co/mzSjvFZjg8Z2g1Ryp2hh6sZpvN wjqqJHt73gnBqwTe/IaWRnYyYyS+XmxhpztJCsrB8ufxw6QwOT7SGAa85HMRvcPHvigs DYnvPoCfu1KKF5+KtVN/Sy8eT5pN1/yiFYeD8YZct2eukmJ+Kh18+qjkiJYLbeVO3yNh ZDco4ygdaAyfr0H+skevqaOdpoukrfkOqAOnyE0b9f98zCuWpS+vK+dLDpXcJQMmYGv/ JSITar69byTC9iPNLg3HbBe1ERFW7Cdto0CkAYCIOwlmm1ha/Jw5jQDInZKY1FaByE1L r4Yg== 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 m2si1325071qka.225.2020.03.11.10.24.58 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 11 Mar 2020 10:24:58 -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]:56240 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jC56H-0005FF-IY for patch@linaro.org; Wed, 11 Mar 2020 13:24:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57980) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jC54z-0001or-Q7 for qemu-devel@nongnu.org; Wed, 11 Mar 2020 13:23:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jC54y-0003ai-Dn for qemu-devel@nongnu.org; Wed, 11 Mar 2020 13:23:37 -0400 Received: from szxga06-in.huawei.com ([45.249.212.32]:35150 helo=huawei.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jC54v-0003RM-QM; Wed, 11 Mar 2020 13:23:34 -0400 Received: from DGGEMS414-HUB.china.huawei.com (unknown [172.30.72.58]) by Forcepoint Email with ESMTP id 7F7603546F68F1E5A408; Thu, 12 Mar 2020 01:23:24 +0800 (CST) Received: from S00345302A-PC.china.huawei.com (10.202.227.237) by DGGEMS414-HUB.china.huawei.com (10.3.19.214) with Microsoft SMTP Server id 14.3.487.0; Thu, 12 Mar 2020 01:23:17 +0800 From: Shameer Kolothum To: , , , Subject: [PATCH v3 01/10] acpi: Use macro for table-loader file name Date: Wed, 11 Mar 2020 17:20:05 +0000 Message-ID: <20200311172014.33052-2-shameerali.kolothum.thodi@huawei.com> X-Mailer: git-send-email 2.12.0.windows.1 In-Reply-To: <20200311172014.33052-1-shameerali.kolothum.thodi@huawei.com> References: <20200311172014.33052-1-shameerali.kolothum.thodi@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.202.227.237] 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, linuxarm@huawei.com, xuwei5@hisilicon.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 --- 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: Igor Mammedov diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c index fb4b166f82..c13710b727 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 9a19c14e66..80f05d728d 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"