From mboxrd@z Thu Jan 1 00:00:00 1970 Received: by 2002:a05:6000:88:0:0:0:0 with SMTP id m8csp268489wrx; Thu, 21 Mar 2019 06:53:05 -0700 (PDT) X-Google-Smtp-Source: APXvYqyuVzUAva5wapaAn/uOAg/iFLDEZoIoMRTSN8y3JqSdfP1HzYbNHAbhEZIhIGiIOECiOXAM X-Received: by 2002:adf:c752:: with SMTP id b18mr2703702wrh.105.1553176385120; Thu, 21 Mar 2019 06:53:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553176385; cv=none; d=google.com; s=arc-20160816; b=QqmnbT59GCOS3U9neL0QAKhB9XkxpvmRAr9+HAhsWh+sIAG3vzWiiLXOqcna/G0E+M pm46q+dF631lHZ5njsK24g2xemQ77XZp3Qx9/zXy/VGO5/pIszb/oIAKhwrVzq4NBAlQ Szydlyyg4isNAWWG73VCh+7GNvJqriUdI5GdhNTgo6j+nAD4Q9G8Y22QuU6FErR09Ee5 ZGDAP/cQKVU1EynACw3xXCF1HTlIYQ0MAg9sgwJGpnuGPbUoh3W6CN0bU2bNinGeFtJn tu2+IBdhtgRYTe8ukdpEmQBpKC+B7u1UlYxQXVmD1OTVWiPkne90vJaoAJioeEWAI5CT m4Lw== 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:references:in-reply-to :message-id:to:from:date; bh=HiAtssLWtdbeNxdwIAeOiRH29BPRw06zgEybfbx7tHw=; b=zxiTcnGf1Fmtq8FPiyrP7H0qiRiV21STWOG72ZPf7P0XDxV5tZJhcnd+Pme+uKOLWg fWpk2QVIWEB2weQo45cl0VgRfYvu3FNec6jx60ujq1Gv+IS6OQO/rOiTTRESoySrT7Oq /eGWBqCCRcoJqUCgFm4wXaLN2zsSw88h/w0FaHvenMhv7eYsYPQlRH8B6DqHNUY+0HFl FlR8XxwWD016EVCaHgx0its1AWmteMEajMGphbIi1knH7hePqNM7GiSBu5KRXe3zHsxw kT8SdvSH8DjrTmQak54XRya6M+QB1GAyYdxXLGmNRQP1id0OprAW32Ty55p6z9WJ2MvO 4tsA== 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=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id n3si3360837wma.50.2019.03.21.06.53.04 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 21 Mar 2019 06:53:05 -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=redhat.com Received: from localhost ([127.0.0.1]:37541 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h6y80-0007j0-3V for alex.bennee@linaro.org; Thu, 21 Mar 2019 09:53:04 -0400 Received: from eggs.gnu.org ([209.51.188.92]:59685) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h6y7k-0007hX-RX for qemu-arm@nongnu.org; Thu, 21 Mar 2019 09:52:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h6y5p-0006Xb-RN for qemu-arm@nongnu.org; Thu, 21 Mar 2019 09:50:51 -0400 Received: from mx1.redhat.com ([209.132.183.28]:20954) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h6y5p-0006UE-9j; Thu, 21 Mar 2019 09:50:49 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5ACD930832EF; Thu, 21 Mar 2019 13:50:47 +0000 (UTC) Received: from localhost (unknown [10.43.2.182]) by smtp.corp.redhat.com (Postfix) with ESMTP id A8B7760857; Thu, 21 Mar 2019 13:50:43 +0000 (UTC) Date: Thu, 21 Mar 2019 14:50:42 +0100 From: Igor Mammedov To: Wei Yang Message-ID: <20190321145042.07217056@redhat.com> In-Reply-To: <20190321002153.24049-1-richardw.yang@linux.intel.com> References: <20190321002153.24049-1-richardw.yang@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.44]); Thu, 21 Mar 2019 13:50:47 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: Re: [Qemu-arm] [PATCH v4] 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, qemu-devel@nongnu.org, shannon.zhaosl@gmail.com, qemu-arm@nongnu.org Errors-To: qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org Sender: "Qemu-arm" X-TUID: msydV2A32AfZ On Thu, 21 Mar 2019 08:21:53 +0800 Wei Yang wrote: > arm and i386 has almost the same function acpi_add_rom_blob(), except > giving different FWCfgCallback function. > > This patch moves acpi_add_rom_blob() to utils.c by passing > FWCfgCallback to it. > > Signed-off-by: Wei Yang > > --- > v4: > * extract -> moves > * adjust comment in source to make checkpatch happy > v3: > * put acpi_add_rom_blob() to hw/acpi/utils.c > v2: > * remove unused header in original source file > --- > hw/acpi/Makefile.objs | 2 +- > hw/acpi/utils.c | 36 ++++++++++++++++++++++++++++++++++++ > hw/arm/virt-acpi-build.c | 26 ++++++++++---------------- > hw/i386/acpi-build.c | 26 ++++++++++---------------- > include/hw/acpi/utils.h | 9 +++++++++ > 5 files changed, 66 insertions(+), 33 deletions(-) > create mode 100644 hw/acpi/utils.c > create mode 100644 include/hw/acpi/utils.h > > diff --git a/hw/acpi/Makefile.objs b/hw/acpi/Makefile.objs > index 2d46e3789a..ba93c5b64a 100644 > --- a/hw/acpi/Makefile.objs > +++ b/hw/acpi/Makefile.objs > @@ -10,7 +10,7 @@ common-obj-$(call lnot,$(CONFIG_ACPI_X86)) += acpi-stub.o > > common-obj-y += acpi_interface.o > common-obj-y += bios-linker-loader.o > -common-obj-y += aml-build.o > +common-obj-y += aml-build.o utils.o > common-obj-$(CONFIG_TPM) += tpm.o > > common-obj-$(CONFIG_IPMI) += ipmi.o > diff --git a/hw/acpi/utils.c b/hw/acpi/utils.c > new file mode 100644 > index 0000000000..9747996c8c > --- /dev/null > +++ b/hw/acpi/utils.c > @@ -0,0 +1,36 @@ > +/* > + * Utilities for generating ACPI tables and passing them to Guests > + * > + * Copyright (C) 2019 Intel Corporation > + * Copyright (C) 2019 Red Hat Inc > + * > + * Author: Wei Yang > + * Author: Igor Mammedov > + * > + * This program is free software; you can redistribute it and/or modify > + * it under the terms of the GNU General Public License as published by > + * the Free Software Foundation; either version 2 of the License, or > + * (at your option) any later version. > + > + * This program is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > + * GNU General Public License for more details. > + > + * You should have received a copy of the GNU General Public License along > + * with this program; if not, see . > + */ > + > +#include "qemu/osdep.h" > +#include is it necessary? > +#include "hw/acpi/aml-build.h" > +#include "hw/acpi/utils.h" > + > +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); > +} > + > diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c > index 57679a89bf..a846f74a14 100644 > --- a/hw/arm/virt-acpi-build.c > +++ b/hw/arm/virt-acpi-build.c > @@ -37,9 +37,9 @@ > #include "hw/acpi/acpi.h" > #include "hw/nvram/fw_cfg.h" > #include "hw/acpi/bios-linker-loader.h" > -#include "hw/loader.h" > #include "hw/hw.h" > #include "hw/acpi/aml-build.h" > +#include "hw/acpi/utils.h" > #include "hw/pci/pcie_host.h" > #include "hw/pci/pci.h" > #include "hw/arm/virt.h" > @@ -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..b17d4a711d 100644 > --- a/hw/i386/acpi-build.c > +++ b/hw/i386/acpi-build.c > @@ -37,7 +37,6 @@ > #include "hw/acpi/cpu.h" > #include "hw/nvram/fw_cfg.h" > #include "hw/acpi/bios-linker-loader.h" > -#include "hw/loader.h" > #include "hw/isa/isa.h" > #include "hw/block/fdc.h" > #include "hw/acpi/memory_hotplug.h" > @@ -58,6 +57,7 @@ > #include "hw/i386/x86-iommu.h" > > #include "hw/acpi/aml-build.h" > +#include "hw/acpi/utils.h" > > #include "qom/qom-qobject.h" > #include "hw/i386/amd_iommu.h" > @@ -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/utils.h b/include/hw/acpi/utils.h > new file mode 100644 > index 0000000000..5212113b7d > --- /dev/null > +++ b/include/hw/acpi/utils.h > @@ -0,0 +1,9 @@ > +#ifndef HW_ACPI_UTILS_H > +#define HW_ACPI_UTILS_H > + > +#include "hw/loader.h" why loader.h and not fw_cfg.h? > + > +MemoryRegion *acpi_add_rom_blob(FWCfgCallback update, void *opaque, > + GArray *blob, const char *name, > + uint64_t max_size); > +#endif