Message ID | 20190325055910.15449-1-richardw.yang@linux.intel.com |
---|---|
State | New |
Headers | show |
Series | [v5] hw/acpi: extract acpi_add_rom_blob() | expand |
On Mon, 25 Mar 2019 13:59:10 +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 moves acpi_add_rom_blob() to utils.c by passing > FWCfgCallback to it. > > Signed-off-by: Wei Yang <richardw.yang@linux.intel.com> > > --- > v5: > * remove unnecessary header glib/gprintf.h > * rearrange include header to make it more suitable > 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..7a890cca06 > --- /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 <richardw.yang@linux.intel.com> > + * Author: Igor Mammedov <imammedo@redhat.com> From history it looks like Michael was an original author and then Shanon copied approach for ARM. So put Michael instead of me. with that fixed up Reviewed-by: Igor Mammedov <imammedo@redhat.com> > + * > + * 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 "hw/acpi/aml-build.h" > +#include "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) > +{ > + 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..140b4de603 > --- /dev/null > +++ b/include/hw/acpi/utils.h > @@ -0,0 +1,9 @@ > +#ifndef HW_ACPI_UTILS_H > +#define HW_ACPI_UTILS_H > + > +#include "hw/nvram/fw_cfg.h" > + > +MemoryRegion *acpi_add_rom_blob(FWCfgCallback update, void *opaque, > + GArray *blob, const char *name, > + uint64_t max_size); > +#endif
On Mon, Mar 25, 2019 at 10:55:04AM +0100, Igor Mammedov wrote: >On Mon, 25 Mar 2019 13:59:10 +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 moves acpi_add_rom_blob() to utils.c by passing >> FWCfgCallback to it. >> >> Signed-off-by: Wei Yang <richardw.yang@linux.intel.com> >> >> --- >> v5: >> * remove unnecessary header glib/gprintf.h >> * rearrange include header to make it more suitable >> 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..7a890cca06 >> --- /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 <richardw.yang@linux.intel.com> >> + * Author: Igor Mammedov <imammedo@redhat.com> > >From history it looks like Michael was an original author and >then Shanon copied approach for ARM. >So put Michael instead of me. Sure, thanks > >with that fixed up > >Reviewed-by: Igor Mammedov <imammedo@redhat.com> > >> + * >> + * 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 "hw/acpi/aml-build.h" >> +#include "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) >> +{ >> + 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..140b4de603 >> --- /dev/null >> +++ b/include/hw/acpi/utils.h >> @@ -0,0 +1,9 @@ >> +#ifndef HW_ACPI_UTILS_H >> +#define HW_ACPI_UTILS_H >> + >> +#include "hw/nvram/fw_cfg.h" >> + >> +MemoryRegion *acpi_add_rom_blob(FWCfgCallback update, void *opaque, >> + GArray *blob, const char *name, >> + uint64_t max_size); >> +#endif
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..7a890cca06 --- /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 <richardw.yang@linux.intel.com> + * Author: Igor Mammedov <imammedo@redhat.com> + * + * 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 "hw/acpi/aml-build.h" +#include "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) +{ + 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..140b4de603 --- /dev/null +++ b/include/hw/acpi/utils.h @@ -0,0 +1,9 @@ +#ifndef HW_ACPI_UTILS_H +#define HW_ACPI_UTILS_H + +#include "hw/nvram/fw_cfg.h" + +MemoryRegion *acpi_add_rom_blob(FWCfgCallback update, void *opaque, + GArray *blob, const char *name, + uint64_t max_size); +#endif
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 <richardw.yang@linux.intel.com> --- v5: * remove unnecessary header glib/gprintf.h * rearrange include header to make it more suitable 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