From mboxrd@z Thu Jan 1 00:00:00 1970 Received: by 2002:a05:6000:88:0:0:0:0 with SMTP id m8csp529718wrx; Fri, 22 Mar 2019 03:09:34 -0700 (PDT) X-Google-Smtp-Source: APXvYqxmdD2MngWdu6/XeUi9lLPtZ6itcsIrzoEm5VXgmVAcxjcPBqHnhACRggy3s4VQ9cEoeJA1 X-Received: by 2002:a5d:574b:: with SMTP id q11mr5535163wrw.41.1553249374908; Fri, 22 Mar 2019 03:09:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553249374; cv=none; d=google.com; s=arc-20160816; b=kiUXd5Pb9+ZhCzJAqJvsk6cg2vqL0INNiMaFS4PZuzmv+ymhTRf2ng3Qa/u47Odt/j 45/aLFucu/+MtmhEAPC2JJXnbYOFk6pr0dYH268hTTU78bMnZ/6mCfDLpSZoxM1cagyI OEWr0E1fCUEM9Q3sw3pLWlJXN7++uahEIL12qBV5JIXZlBw2lJ+0UClxSs4G+aSqu0KH NwScHY07OFeBybJn2LG/P9UrOBx7J8pKSqC2JAWUr80/Fc/CRMsWqbMel3w1iiCh0s36 xzzbc7fnmknCT58dcJpA9e/OF7vXbcdqGpSXorRye3npxOk7wgrEG91Ssql1bSmIuttO pD0A== 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=LSjPtC0gMuUVKKCKjsBJiSZYXKPbWSJ6m1C7J15sFYQ=; b=oWEwwTOOXKRN6JRpmVd3DgrCAQV9R+lj0ISg1sU4mXjxQwgyj/n/sNKqQYbbgD+5GX +aAwU2xDEUwj4NPY1+DCEUAFC3q4gqmfmyw3M38zQmF+8NORiC1CDJgcL+Y0+4najQcH f58sd10jT3b+ULQxliOg7oHwb6i9di9+GKYlcfQREPjWhIx7YMxkCPX/B8veEODvqoBG q/R6lT+5TQRoFtUdoMDBKYWW2ku2Ru9bL3h0kkzDyuHqHi4v6CyiOZKptWQolXo5HYCs tuuQ50cR5bEarrbZdYGzzwcaMbr5YgJExRoC3N9RPNkRh2H8hK2twOTM6lKIspY1Npaq Yzaw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-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 h4si4743619wrr.272.2019.03.22.03.09.34 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 22 Mar 2019 03:09:34 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-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-devel-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-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]:54893 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h7H7F-00085V-QQ for alex.bennee@linaro.org; Fri, 22 Mar 2019 06:09:33 -0400 Received: from eggs.gnu.org ([209.51.188.92]:60178) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h7H6j-0007uh-Pp for qemu-devel@nongnu.org; Fri, 22 Mar 2019 06:09:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h7H1f-0007yX-96 for qemu-devel@nongnu.org; Fri, 22 Mar 2019 06:03:48 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35708) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h7H1c-0007n1-Ra; Fri, 22 Mar 2019 06:03:45 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id BD156308FC4D; Fri, 22 Mar 2019 10:03:42 +0000 (UTC) Received: from localhost (unknown [10.43.2.182]) by smtp.corp.redhat.com (Postfix) with ESMTP id C53B15C6B6; Fri, 22 Mar 2019 10:03:35 +0000 (UTC) Date: Fri, 22 Mar 2019 11:03:34 +0100 From: Igor Mammedov To: Wei Yang Message-ID: <20190322110334.2a928f54@redhat.com> In-Reply-To: <20190322002027.GA21574@richard> References: <20190321002153.24049-1-richardw.yang@linux.intel.com> <20190321145042.07217056@redhat.com> <20190322002027.GA21574@richard> 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.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.43]); Fri, 22 Mar 2019 10:03:42 +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-devel] [PATCH v4] hw/acpi: extract acpi_add_rom_blob() X-BeenThere: qemu-devel@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-devel-bounces+alex.bennee=linaro.org@nongnu.org Sender: "Qemu-devel" X-TUID: 6Ny2QrihoLdw On Fri, 22 Mar 2019 08:20:27 +0800 Wei Yang wrote: > On Thu, Mar 21, 2019 at 02:50:42PM +0100, Igor Mammedov wrote: > >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? > > > > Will remove this. > > >> +#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? > > > > Which fw_cfg.h? There is only two fw_cfg.h in qemu. > > $ find . -name fw_cfg.h > ./include/hw/nvram/fw_cfg.h > ./tests/libqos/fw_cfg.h > > Replace hw/loader.h with hw/nvram/fw_cfg.h will fail. Point here is to not to put in header a dependency that symbols in this header do not need so you need a header that declares FWCfgCallback and that's all. loader.h should go into utils.c file > > Do get your point here. > > >> + > >> +MemoryRegion *acpi_add_rom_blob(FWCfgCallback update, void *opaque, > >> + GArray *blob, const char *name, > >> + uint64_t max_size); > >> +#endif >