Commit 82f76c67 authored by Wei Yang's avatar Wei Yang Committed by Michael S. Tsirkin
Browse files

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.

Signed-off-by: default avatarWei Yang <richardw.yang@linux.intel.com>
Reviewed-by: default avatarIgor Mammedov <imammedo@redhat.com>

v7:
  * rebase on top of current master because of conflict
v6:
  * change author from Igor to Michael
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
Message-Id: <20190610011830.28398-1-richardw.yang@linux.intel.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent 240e647a

hw/acpi/Makefile.objs

+1 −1
Original line number Diff line number Diff line
@@ -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_ACPI_PCI) += pci.o

common-obj-$(CONFIG_TPM) += tpm.o

hw/acpi/utils.c

0 → 100644
+35 −0
Original line number Diff line number Diff line 
/*

 * 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: Michael S. Tsirkin <mst@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);

}

hw/arm/virt-acpi-build.c

+10 −16
Original line number Diff line number Diff line
@@ -36,9 +36,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/acpi/pci.h"

#include "hw/pci/pcie_host.h"

#include "hw/pci/pci.h"
@@ -865,14 +865,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,
@@ -904,19 +896,21 @@ 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,

    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,

    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);

hw/i386/acpi-build.c

+10 −16
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ 
#include "hw/acpi/piix4.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 "hw/acpi/pci.h"



#include "qom/qom-qobject.h"
@@ -2823,14 +2823,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,
@@ -2872,14 +2864,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,

    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));
@@ -2916,7 +2909,8 @@ 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,

        build_state->rsdp_mr = acpi_add_rom_blob(acpi_build_update,

                                                 build_state, tables.rsdp,

                                                 ACPI_BUILD_RSDP_FILE, 0);

    }

include/hw/acpi/utils.h

0 → 100644
+9 −0
Original line number Diff line number Diff line 
#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