Received: by 2002:adf:f011:0:0:0:0:0 with SMTP id j17csp511807wro; Thu, 14 Mar 2019 00:16:31 -0700 (PDT) X-Google-Smtp-Source: APXvYqytZYr7KDFYqTDXPY+JE4HlGUwuYYEymCTCHAKM/YEsCdDnNglqf5OAY0IiIBKRAThw7wMY X-Received: by 2002:a0d:ffc5:: with SMTP id p188mr27603531ywf.40.1552547791051; Thu, 14 Mar 2019 00:16:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1552547791; cv=none; d=google.com; s=arc-20160816; b=B/MzjZK8ThCZ8vef3k/8BWF+HvHBh7q4hoCoGscwSFWI8/uYKZzD/vtA8Q/XdZdWet mY+j87SumvEfleuRTJtPSxY+x/JU3QtjZZpPH0+ZHcGmJ2d2eEMgCO2SOvaVQAJBnNvn PNGJJp9eKakYqAN33q0DUlJNb2zbyYIdXXMQsSgPFga9sxaC5rVaWuX/lnIevM0v0eF/ XTHwO9FNa9pRwv4KWMytvj78lhji06Uk139KpeV1W+O2LJG8cslkqEQqVEQ6qkQJ+ijQ brGgc+JXoi4LXz7k//4n4graZAtRCZkeugeOu9S6Gin3Raaou4sLoxsJatLt7eHpg21T Sjbg== 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:subject :content-transfer-encoding:mime-version:message-id:date:to:from; bh=Yvs4vmZpzpmFbqsDg2fs5U6rm8D/Rih74JsUPih7eCE=; b=gLgEPFlM/EaX09YWewcF2gsYQvTzUCVL2bFydCYCgh1U/ZQw3Fh5GWorUV2Daeefct 8arfTlVcFGM9tEVEDcLbZSpwUf6BMz9R/8IdK5qJIlK/rXBA3nY5cfz31+AJK/WmgHNW /qVG2D9OCj7sN1UvHA9FujmIoMsjXthUbAtZrf4mUWvvt2Qb8ajAK2enJgMT1RdA8HgI WkxRTIooWUmkjlgQzQVSF5W/znk8AvSTuvXgI9He4ZiVi5oMo+6XxmgRcukppnitnH2L stziNlXKwhFC5Af0sV+ACfM16u2sG+Km8L4XzBdGPtntNir/LNPuWg4C4f/jirfr/eaW bu8w== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 127si8081113ybb.258.2019.03.14.00.16.30 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 14 Mar 2019 00:16:31 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-arm-bounces+alex.bennee=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-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from localhost ([127.0.0.1]:58348 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h4KbO-0002uw-Gf for alex.bennee@linaro.org; Thu, 14 Mar 2019 03:16:30 -0400 Received: from eggs.gnu.org ([209.51.188.92]:41927) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h4KbE-0002um-B2 for qemu-arm@nongnu.org; Thu, 14 Mar 2019 03:16:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h4KbD-0006Zv-7x for qemu-arm@nongnu.org; Thu, 14 Mar 2019 03:16:20 -0400 Received: from mga18.intel.com ([134.134.136.126]:56151) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h4KbC-0006Sq-Uw; Thu, 14 Mar 2019 03:16:19 -0400 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga106.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 14 Mar 2019 00:16:11 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.58,477,1544515200"; d="scan'208";a="151588846" Received: from richard.sh.intel.com (HELO localhost) ([10.239.159.54]) by fmsmga002.fm.intel.com with ESMTP; 14 Mar 2019 00:16:09 -0700 From: Wei Yang To: qemu-devel@nongnu.org, qemu-arm@nongnu.org Date: Thu, 14 Mar 2019 15:15:43 +0800 Message-Id: <20190314071543.16935-1-richardw.yang@linux.intel.com> X-Mailer: git-send-email 2.19.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 134.134.136.126 Subject: [Qemu-arm] [PATCH] hw/acpi: extract acpi_add_rom_blob() X-BeenThere: qemu-arm@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: yang.zhong@intel.com, peter.maydell@linaro.org, mst@redhat.com, shannon.zhaosl@gmail.com, Wei Yang , imammedo@redhat.com Errors-To: qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org Sender: "Qemu-arm" X-TUID: HFAq11Pu3M/R arm and i386 has almost the same function acpi_add_rom_blob(), except giving different FWCfgCallback function. This patch extract acpi_add_rom_blob() to aml-build.c by passing FWCfgCallback to it. Signed-off-by: Wei Yang --- hw/acpi/aml-build.c | 8 ++++++++ hw/arm/virt-acpi-build.c | 24 +++++++++--------------- hw/i386/acpi-build.c | 24 +++++++++--------------- include/hw/acpi/aml-build.h | 4 ++++ 4 files changed, 30 insertions(+), 30 deletions(-) diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c index 555c24f21d..ed427f8310 100644 --- a/hw/acpi/aml-build.c +++ b/hw/acpi/aml-build.c @@ -1559,6 +1559,14 @@ void *acpi_data_push(GArray *table_data, unsigned size) return table_data->data + off; } +MemoryRegion *acpi_add_rom_blob(FWCfgCallback update, void *opaque, + GArray *blob, const char *name, + uint64_t max_size) +{ + return rom_add_blob(name, blob->data, acpi_data_len(blob), max_size, -1, + name, update, opaque, NULL, true); +} + unsigned acpi_data_len(GArray *table) { assert(g_array_get_element_size(table) == 1); diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c index 57679a89bf..ea4ac68b60 100644 --- a/hw/arm/virt-acpi-build.c +++ b/hw/arm/virt-acpi-build.c @@ -881,14 +881,6 @@ static void virt_acpi_build_reset(void *build_opaque) build_state->patched = false; } -static MemoryRegion *acpi_add_rom_blob(AcpiBuildState *build_state, - GArray *blob, const char *name, - uint64_t max_size) -{ - return rom_add_blob(name, blob->data, acpi_data_len(blob), max_size, -1, - name, virt_acpi_build_update, build_state, NULL, true); -} - static const VMStateDescription vmstate_virt_acpi_build = { .name = "virt_acpi_build", .version_id = 1, @@ -920,20 +912,22 @@ void virt_acpi_setup(VirtMachineState *vms) virt_acpi_build(vms, &tables); /* Now expose it all to Guest */ - build_state->table_mr = acpi_add_rom_blob(build_state, tables.table_data, - ACPI_BUILD_TABLE_FILE, - ACPI_BUILD_TABLE_MAX_SIZE); + build_state->table_mr = acpi_add_rom_blob(virt_acpi_build_update, + build_state, tables.table_data, + ACPI_BUILD_TABLE_FILE, + ACPI_BUILD_TABLE_MAX_SIZE); assert(build_state->table_mr != NULL); build_state->linker_mr = - acpi_add_rom_blob(build_state, tables.linker->cmd_blob, - "etc/table-loader", 0); + acpi_add_rom_blob(virt_acpi_build_update, build_state, + tables.linker->cmd_blob, "etc/table-loader", 0); fw_cfg_add_file(vms->fw_cfg, ACPI_BUILD_TPMLOG_FILE, tables.tcpalog->data, acpi_data_len(tables.tcpalog)); - build_state->rsdp_mr = acpi_add_rom_blob(build_state, tables.rsdp, - ACPI_BUILD_RSDP_FILE, 0); + build_state->rsdp_mr = acpi_add_rom_blob(virt_acpi_build_update, + build_state, tables.rsdp, + ACPI_BUILD_RSDP_FILE, 0); qemu_register_reset(virt_acpi_build_reset, build_state); virt_acpi_build_reset(build_state); diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index 416da318ae..af2a944dd2 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -2842,14 +2842,6 @@ static void acpi_build_reset(void *build_opaque) build_state->patched = 0; } -static MemoryRegion *acpi_add_rom_blob(AcpiBuildState *build_state, - GArray *blob, const char *name, - uint64_t max_size) -{ - return rom_add_blob(name, blob->data, acpi_data_len(blob), max_size, -1, - name, acpi_build_update, build_state, NULL, true); -} - static const VMStateDescription vmstate_acpi_build = { .name = "acpi_build", .version_id = 1, @@ -2891,14 +2883,15 @@ void acpi_setup(void) acpi_build(&tables, MACHINE(pcms)); /* Now expose it all to Guest */ - build_state->table_mr = acpi_add_rom_blob(build_state, tables.table_data, - ACPI_BUILD_TABLE_FILE, - ACPI_BUILD_TABLE_MAX_SIZE); + build_state->table_mr = acpi_add_rom_blob(acpi_build_update, + build_state, tables.table_data, + ACPI_BUILD_TABLE_FILE, + ACPI_BUILD_TABLE_MAX_SIZE); assert(build_state->table_mr != NULL); build_state->linker_mr = - acpi_add_rom_blob(build_state, tables.linker->cmd_blob, - "etc/table-loader", 0); + acpi_add_rom_blob(acpi_build_update, build_state, + tables.linker->cmd_blob, "etc/table-loader", 0); fw_cfg_add_file(pcms->fw_cfg, ACPI_BUILD_TPMLOG_FILE, tables.tcpalog->data, acpi_data_len(tables.tcpalog)); @@ -2935,8 +2928,9 @@ void acpi_setup(void) build_state->rsdp_mr = NULL; } else { build_state->rsdp = NULL; - build_state->rsdp_mr = acpi_add_rom_blob(build_state, tables.rsdp, - ACPI_BUILD_RSDP_FILE, 0); + build_state->rsdp_mr = acpi_add_rom_blob(acpi_build_update, + build_state, tables.rsdp, + ACPI_BUILD_RSDP_FILE, 0); } qemu_register_reset(acpi_build_reset, build_state); diff --git a/include/hw/acpi/aml-build.h b/include/hw/acpi/aml-build.h index 1a563ad756..4945aeef5b 100644 --- a/include/hw/acpi/aml-build.h +++ b/include/hw/acpi/aml-build.h @@ -3,6 +3,7 @@ #include "hw/acpi/acpi-defs.h" #include "hw/acpi/bios-linker-loader.h" +#include "hw/loader.h" /* Reserve RAM space for tables: add another order of magnitude. */ #define ACPI_BUILD_TABLE_MAX_SIZE 0x200000 @@ -383,6 +384,9 @@ build_header(BIOSLinker *linker, GArray *table_data, AcpiTableHeader *h, const char *sig, int len, uint8_t rev, const char *oem_id, const char *oem_table_id); void *acpi_data_push(GArray *table_data, unsigned size); +MemoryRegion *acpi_add_rom_blob(FWCfgCallback update, void *opaque, + GArray *blob, const char *name, + uint64_t max_size); unsigned acpi_data_len(GArray *table); void acpi_add_table(GArray *table_offsets, GArray *table_data); void acpi_build_tables_init(AcpiBuildTables *tables); -- 2.19.1