hw/acpi: extract acpi_add_rom_blob()
PATCH v4 1/1 hw/acpi: extract acpi_add_rom_blob()
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.
---
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
hw/acpi/Makefile.objs +1 -1
@@ -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
hw/acpi/utils.c new file +36 -0
@@ -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 <[email protected]> +* Author: Igor Mammedov <[email protected]> +* +* 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 <http://www.gnu.org/licenses/>. +*/ + +#include "qemu/osdep.h" +#include <glib/gprintf.h> +#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); +} +
hw/arm/virt-acpi-build.c +10 -16
@@ -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);
hw/i386/acpi-build.c +10 -16
@@ -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);
include/hw/acpi/utils.h new file +9 -0
@@ -0,0 +1,9 @@ +#ifndef HW_ACPI_UTILS_H +#define HW_ACPI_UTILS_H + +#include "hw/loader.h" + +MemoryRegion *acpi_add_rom_blob (FWCfgCallback update,void *opaque, +GArray *blob,const char *name, +uint64_t max_size); +#endif
Signature · 1 line
2.19.1
Quoted 61 lines · On Thu, 21 Mar 2019 08:21:53 +0800 Wei Yang <[email protected]>…
arm and i386 has almost the same function
acpi_add_rom_blob(), except giving different FWCfgCallback function.This patch moves
acpi_add_rom_blob()toutils.cby passing FWCfgCallback to it.Signed-off-by Wei Yang <[email protected]>---
v4:
* extract -> moves
* adjust comment in source to make checkpatch happy
v3:
* putacpi_add_rom_blob()tohw/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.hhw/acpi/Makefile.objs +1
-1@@ -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.ohw/acpi/utils.c new file +16
-0@@ -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 <[email protected]> +* Author: Igor Mammedov <[email protected]> +* +* 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
hw/acpi/utils.c line 25
Quoted 10 lines
hw/acpi/utils.c new file +9
-0+* 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 <http://www.gnu.org/licenses/>. +*/ + +#include "qemu/osdep.h" +#include <glib/gprintf.h>
is it necessary?
Quoted 147 lines
hw/acpi/utils.c new file +11
-0+#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); +} +hw/arm/virt-acpi-build.c +10
-16@@ -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);hw/i386/acpi-build.c +10
-16@@ -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);include/hw/acpi/utils.h new file +0
-0
include/hw/acpi/utils.h line 4
Quoted 4 lines
include/hw/acpi/utils.h new file +4
-0@@ -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?
Quoted 5 lines
include/hw/acpi/utils.h new file +5
-0+ +MemoryRegion *acpi_add_rom_blob (FWCfgCallback update,void *opaque, +GArray *blob,const char *name, +uint64_t max_size); +#endif
Quoted 73 lines · Igor Mammedov
Quoted 69 lines · On Thu, 21 Mar 2019 08:21:53 +0800 Wei Yang <[email protected]>…
arm and i386 has almost the same function
acpi_add_rom_blob(), except giving different FWCfgCallback function.This patch moves
acpi_add_rom_blob()toutils.cby passing FWCfgCallback to it.Signed-off-by Wei Yang <[email protected]>---
v4:
* extract -> moves
* adjust comment in source to make checkpatch happy
v3:
* putacpi_add_rom_blob()tohw/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.hhw/acpi/Makefile.objs +1
-1@@ -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.ohw/acpi/utils.c new file +24
-0@@ -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 <[email protected]> +* Author: Igor Mammedov <[email protected]> +* +* 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 <http://www.gnu.org/licenses/>. +*/ + +#include "qemu/osdep.h"
Quoted 3 lines
hw/acpi/utils.c line 25
Quoted 1 line
hw/acpi/utils.c new file +1
-0+#include <glib/gprintf.h> is it necessary?
Will remove this.
Quoted 140 lines
Quoted 140 lines
hw/acpi/utils.c new file +11
-0+#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); +} +hw/arm/virt-acpi-build.c +10
-16@@ -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);hw/i386/acpi-build.c +10
-16@@ -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 ); }
Quoted 14 lines
include/hw/acpi/utils.h line 4
Quoted 11 lines
hw/i386/acpi-build.c +0
-0qemu_register_reset (acpi_build_reset, build_state);include/hw/acpi/utils.h new file +4
-0@@ -0,0 +1,9 @@ +#ifndef HW_ACPI_UTILS_H +#define HW_ACPI_UTILS_H + +#include "hw/loader.h" why
loader.hand notfw_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.
Do get your point here.
Quoted 5 lines
Quoted 5 lines
include/hw/acpi/utils.h new file +5
-0+ +MemoryRegion *acpi_add_rom_blob (FWCfgCallback update,void *opaque, +GArray *blob,const char *name, +uint64_t max_size); +#endif
Signature · 2 lines
Wei Yang Help you, Help me
Quoted 235 lines · On Fri, 22 Mar 2019 08:20:27 +0800 Wei Yang <[email protected]>…
Quoted 73 lines · Igor Mammedov
Quoted 69 lines · On Thu, 21 Mar 2019 08:21:53 +0800 Wei Yang <[email protected]>…
arm and i386 has almost the same function
acpi_add_rom_blob(), except giving different FWCfgCallback function.This patch moves
acpi_add_rom_blob()toutils.cby passing FWCfgCallback to it.Signed-off-by Wei Yang <[email protected]>---
v4:
* extract -> moves
* adjust comment in source to make checkpatch happy
v3:
* putacpi_add_rom_blob()tohw/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.hhw/acpi/Makefile.objs +1
-1@@ -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.ohw/acpi/utils.c new file +24
-0@@ -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 <[email protected]> +* Author: Igor Mammedov <[email protected]> +* +* 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 <http://www.gnu.org/licenses/>. +*/ + +#include "qemu/osdep.h" Quoted 3 lines
hw/acpi/utils.c line 25
Quoted 1 line
hw/acpi/utils.c new file +1
-0+#include <glib/gprintf.h> is it necessary?
Will remove this.
Quoted 140 lines
Quoted 140 lines
hw/acpi/utils.c new file +11
-0+#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); +} +hw/arm/virt-acpi-build.c +10
-16@@ -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);hw/i386/acpi-build.c +10
-16@@ -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 ); }Quoted 14 lines
include/hw/acpi/utils.h line 4
Quoted 11 lines
hw/i386/acpi-build.c +0
-0qemu_register_reset (acpi_build_reset, build_state);include/hw/acpi/utils.h new file +4
-0@@ -0,0 +1,9 @@ +#ifndef HW_ACPI_UTILS_H +#define HW_ACPI_UTILS_H + +#include "hw/loader.h" why
loader.hand notfw_cfg.h?
Quoted 7 lines
Which
fw_cfg.h? There is only twofw_cfg.hin qemu.$ find . -name fw_cfg.h ./include/hw/nvram/fw_cfg.h ./tests/libqos/fw_cfg.hReplace
hw/loader.hwithhw/nvram/fw_cfg.hwill 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
Quoted 9 lines
Do get your point here.
Quoted 5 lines
Quoted 5 lines
include/hw/acpi/utils.h new file +5
-0+ +MemoryRegion *acpi_add_rom_blob (FWCfgCallback update,void *opaque, +GArray *blob,const char *name, +uint64_t max_size); +#endif