From patchwork Mon Apr 13 11:09:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Michael S. Tsirkin" X-Patchwork-Id: 185373 Delivered-To: patch@linaro.org Received: by 2002:a92:3d9a:0:0:0:0:0 with SMTP id k26csp115256ilf; Mon, 13 Apr 2020 04:10:19 -0700 (PDT) X-Google-Smtp-Source: APiQypIqCFh1n9TdZGLNjjLkeKiOumB0X2+EnBoF9K6Cunb48k11T8P1d75iTlN3b6K4pRdFwWcd X-Received: by 2002:a37:7347:: with SMTP id o68mr15646690qkc.463.1586776219309; Mon, 13 Apr 2020 04:10:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1586776219; cv=none; d=google.com; s=arc-20160816; b=Fw/77sEw5xEm2AkemCm8sfcVvk5GXgFRt3tMARkyszNYG3zbuo61Z1Imp35YaHL/Kw LUdT5VkQCnLz8CFoI9oNBJ55Ksb8aEUyQxTlhDuRHS3urxi5NtzphlMj3wll6H0wEgaQ GUKFPaArv9ebTZqJ9CiueU0hvwHjB0dv0MJLk4AJh+ten27Gw4NYNDlROOIzzoIVlfht MRT+APuqHoTQpMTnY5/8wAjv6qx8b2tRqBFxvyKhjqEUuuz4vBVhzb6S8coOPEDQrfB5 bJl++1OU3qI+6WyvqFbMliGP1+QS1aCo0CPmAIXpW1+pfkWO44HzlNgHeqFHPNV6bvIj ptBg== 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:content-disposition :content-transfer-encoding:in-reply-to:mime-version:references :message-id:subject:to:from:date:dkim-signature; bh=CJQx85+FirRBKcuYybxlgWpS5zFo+gnEtyDRFkVHinY=; b=SGRyNIHllmKIiVhGwPCbGzNbfKiffdgsw9R3Pi6VRF+UNeW4vzJyD56u8z9kYD/uli IJI5sFSdy+bJ5aQFnoW2vS7H3BreMrKmxErSY36ozZGl9mCdXb/BceQ+9EQt5LSS9GdB i7w3pMuWgnIgEVSfAA9e5BTLTSxdqDTW7Nz8B6EhFwttQHR2oRTHh6hwgx6vkN5ir30l wxk/PybhaKltDi23L2RgGaGcNXDEoZaXqQ8F0KZA6+etuMZ2Uot/GoKp4n618bukJQRy +gbX2orhf8REtBu08xkUW2XuxEfPTGlgkkUJ6xREgWuYF2aPa5mS7gBKIgkUR+QsNdLG gw3g== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@redhat.com header.s=mimecast20190719 header.b=VFPo+lwS; 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"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id v3si5330635qtk.176.2020.04.13.04.10.19 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 13 Apr 2020 04:10:19 -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; dkim=fail header.i=@redhat.com header.s=mimecast20190719 header.b=VFPo+lwS; 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"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1]:43008 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jNwyo-0007Zx-Qs for patch@linaro.org; Mon, 13 Apr 2020 07:10:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58569) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jNwxl-0007Qx-TW for qemu-devel@nongnu.org; Mon, 13 Apr 2020 07:09:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jNwxk-0006hG-PH for qemu-devel@nongnu.org; Mon, 13 Apr 2020 07:09:13 -0400 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:51763 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jNwxk-0006cs-Kf for qemu-devel@nongnu.org; Mon, 13 Apr 2020 07:09:12 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1586776152; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=CJQx85+FirRBKcuYybxlgWpS5zFo+gnEtyDRFkVHinY=; b=VFPo+lwSfwadsO6fRbG52hZedlpgfXd9fDkHqRnq9QO31lFViOWqiSV1OrSeB44S9QJKYN V1btN4N22EDsBQHRZDM8N8BTV8448cyZ09OZdtb2bkA960Fa0Hhui45OO2sQoK9BQi+hLQ Nt5FKyM9mPygKFKrp/ZJJ62rUCBBoIw= Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-41-PDjKSwyHNhC5evrBn1bIRg-1; Mon, 13 Apr 2020 07:09:10 -0400 X-MC-Unique: PDjKSwyHNhC5evrBn1bIRg-1 Received: by mail-wr1-f71.google.com with SMTP id f15so6572258wrj.2 for ; Mon, 13 Apr 2020 04:09:10 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:content-transfer-encoding :in-reply-to; bh=wu2DMb7EM7lw3R1vo6KDqbpnls1BmYoUZ7qyMICe52c=; b=aWbMTjSP9nFFwnSsMEaRteOVtpMKP5xiVb/BCg2f/sjVM9aOsTVRvGbl5MAZESQf2n yBg5GTCy8HKgMFXaX/gshBortZEXnWgbNdcZ747R35kKTREI/AFTJeauuQG1mnTnjR+z 7RdcXshA/H7zMOP7zE1u8D+p4sbJnuG6VRmdcHOBLhisQoPnDUNgox3CGgjbkQCMQ+J/ Oe17JuOlr5R0IHhwilusH2er61aOC7TM0xbk6Jl8yg2ceN2ZMGFXAJQCIQ12cEwnpAnH ib6AzG+dXIST2hr4lIldG5URrHLC+DkLJm+kt044/43zwQ+q163ou1sStMnwGNwBFsVW KSTA== X-Gm-Message-State: AGi0PuaOBBweGz5XOaUEW38X2P802wVNlf7iH89pGo3XVJEBdUZNiUBQ TZ5U4p24XW0muyuyPrtLy4Jh0RbgQ+t2/5OmH2RhnXMKEDS9VSZXo+dfTml2kHB4aqM8sLhVTFw HIZPkHE5VzAJT10M= X-Received: by 2002:adf:b78b:: with SMTP id s11mr17520440wre.235.1586776149431; Mon, 13 Apr 2020 04:09:09 -0700 (PDT) X-Received: by 2002:adf:b78b:: with SMTP id s11mr17520428wre.235.1586776149216; Mon, 13 Apr 2020 04:09:09 -0700 (PDT) Received: from redhat.com ([185.107.45.41]) by smtp.gmail.com with ESMTPSA id u15sm13218433wrn.46.2020.04.13.04.09.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Apr 2020 04:09:08 -0700 (PDT) Date: Mon, 13 Apr 2020 07:09:06 -0400 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Subject: [PULL 2/4] acpi: Use macro for table-loader file name Message-ID: <20200413110838.151374-3-mst@redhat.com> References: <20200413110838.151374-1-mst@redhat.com> MIME-Version: 1.0 In-Reply-To: <20200413110838.151374-1-mst@redhat.com> X-Mailer: git-send-email 2.24.1.751.gd10ce2899c X-Mutt-Fcc: =sent X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Disposition: inline X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.81 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 , Eduardo Habkost , Shameer Kolothum , Shannon Zhao , qemu-arm@nongnu.org, Igor Mammedov , Paolo Bonzini , Philippe =?utf-8?q?Mathieu-Daud=C3=A9?= , Richard Henderson Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Shameer Kolothum 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 Message-Id: <20200403101827.30664-2-shameerali.kolothum.thodi@huawei.com> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin Reviewed-by: Philippe Mathieu-Daudé --- include/hw/acpi/aml-build.h | 1 + hw/arm/virt-acpi-build.c | 2 +- hw/i386/acpi-build.c | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) -- MST 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" 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));