hw/acpi: extract acpi_add_rom_blob()
PATCH v2 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 extract acpi_add_rom_blob() to aml-build.c by passing FWCfgCallback to it.
---
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(-)
hw/acpi/aml-build.c +8 -0
@@ -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 );
hw/arm/virt-acpi-build.c +9 -16
@@ -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);
hw/i386/acpi-build.c +9 -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"
@@ -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);
include/hw/acpi/aml-build.h +4 -0
@@ -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);
Signature · 1 line
2.19.1
hw/acpi/aml-build.c
Quoted 22 lines · On Thu, 14 Mar 2019 15:38:36 +0800 Wei Yang <[email protected]>…
arm and i386 has almost the same function
acpi_add_rom_blob(), except giving different FWCfgCallback function.This patch extract
acpi_add_rom_blob()toaml-build.cby passing FWCfgCallback to it.Signed-off-by Wei Yang <[email protected]>---
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(-)hw/acpi/aml-build.c +0
-0
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
Quoted 154 lines
hw/acpi/aml-build.c +8
-0@@ -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 );hw/arm/virt-acpi-build.c +9
-16@@ -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);hw/i386/acpi-build.c +9
-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" @@ -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);include/hw/acpi/aml-build.h +4
-0@@ -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);
Quoted 29 lines · Igor Mammedov
hw/acpi/aml-build.c
Quoted 22 lines · On Thu, 14 Mar 2019 15:38:36 +0800 Wei Yang <[email protected]>…
arm and i386 has almost the same function
acpi_add_rom_blob(), except giving different FWCfgCallback function.This patch extract
acpi_add_rom_blob()toaml-build.cby passing FWCfgCallback to it.Signed-off-by Wei Yang <[email protected]>---
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(-)hw/acpi/aml-build.c +0
-0I'd like to keep
aml-build.cclean from not spec related code, Lets create a separate source file for QEMU specific code, something like hw/acpi/utils.(h|c)
Quoted 2 lines
otherwise patch looks fine to me
Reasonable, thanks for this comment.
Quoted 156 lines
Quoted 155 lines
hw/acpi/aml-build.c +8
-0@@ -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 );hw/arm/virt-acpi-build.c +9
-16@@ -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);hw/i386/acpi-build.c +9
-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" @@ -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);include/hw/acpi/aml-build.h +4
-0@@ -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);
Signature · 2 lines
Wei Yang Help you, Help me