From: Igor Mammedov <imammedo@redhat.com>
To: Wei Yang <richardw.yang@linux.intel.com>
Cc: yang.zhong@intel.com, peter.maydell@linaro.org, mst@redhat.com,
qemu-devel@nongnu.org, shannon.zhaosl@gmail.com,
qemu-arm@nongnu.org
Subject: Re: [Qemu-arm] [PATCH v2] hw/acpi: extract acpi_add_rom_blob()
Date: Thu, 14 Mar 2019 10:25:14 +0100 [thread overview]
Message-ID: <20190314102514.1a5459ca@redhat.com> (raw)
In-Reply-To: <20190314073836.19874-1-richardw.yang@linux.intel.com>
On Thu, 14 Mar 2019 15:38:36 +0800
Wei Yang <richardw.yang@linux.intel.com> wrote:
> 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 <richardw.yang@linux.intel.com>
>
> ---
> v2:
> * remove unused header in original source file
> ---
> hw/acpi/aml-build.c | 8 ++++++++
> hw/arm/virt-acpi-build.c | 25 +++++++++----------------
> hw/i386/acpi-build.c | 25 +++++++++----------------
> include/hw/acpi/aml-build.h | 4 ++++
> 4 files changed, 30 insertions(+), 32 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
I'd like to keep aml-build.c clean from not spec related code,
Lets create a separate source file for QEMU specific code, something like
hw/acpi/utils.(h|c)
otherwise patch looks fine to me
> @@ -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..f7fd0cf06a 100644
> --- a/hw/arm/virt-acpi-build.c
> +++ b/hw/arm/virt-acpi-build.c
> @@ -37,7 +37,6 @@
> #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/pci/pcie_host.h"
> @@ -881,14 +880,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 +911,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..bc6e4b1f01 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"
> @@ -2842,14 +2841,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 +2882,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 +2927,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);
next prev parent reply other threads:[~2019-03-14 9:30 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-14 7:38 [Qemu-arm] [PATCH v2] hw/acpi: extract acpi_add_rom_blob() Wei Yang
2019-03-14 9:25 ` Igor Mammedov [this message]
2019-03-14 11:56 ` [Qemu-devel] " Wei Yang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190314102514.1a5459ca@redhat.com \
--to=imammedo@redhat.com \
--cc=mst@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=richardw.yang@linux.intel.com \
--cc=shannon.zhaosl@gmail.com \
--cc=yang.zhong@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.