ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

acpi: cleanup bios_linker_loader_cleanup() 

bios_linker_loader_cleanup() is called only from one place
and returned value is immediately freed wich makes returning
pointer from bios_linker_loader_cleanup() useless.

Cleanup bios_linker_loader_cleanup() by freeing
data there so that caller won't have to free it.

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Igor Mammedov 2016-05-19 15:19:27 +02:00 committed by Michael S. Tsirkin
parent ad9671b870
commit 8cc87c3179
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hw/acpi/aml-build.c
View File

@ -1548,8 +1548,7 @@ void acpi_build_tables_init(AcpiBuildTables *tables)
void acpi_build_tables_cleanup(AcpiBuildTables *tables, bool mfre) void acpi_build_tables_cleanup(AcpiBuildTables *tables, bool mfre)
{ {
void *linker_data = bios_linker_loader_cleanup(tables->linker); bios_linker_loader_cleanup(tables->linker);
g_free(linker_data);
g_array_free(tables->rsdp, true); g_array_free(tables->rsdp, true);
g_array_free(tables->table_data, true); g_array_free(tables->table_data, true);
g_array_free(tables->tcpalog, mfre); g_array_free(tables->tcpalog, mfre);

8
hw/acpi/bios-linker-loader.c
View File

@ -121,12 +121,13 @@ BIOSLinker *bios_linker_loader_init(void)
return linker; return linker;
} }
/* Free linker wrapper and return the linker commands array. */ /* Free linker wrapper */
void *bios_linker_loader_cleanup(BIOSLinker *linker) void bios_linker_loader_cleanup(BIOSLinker *linker)
{ {
int i; int i;
BiosLinkerFileEntry *entry; BiosLinkerFileEntry *entry;
void *cmd_blob = g_array_free(linker->cmd_blob, false);
g_array_free(linker->cmd_blob, true);
for (i = 0; i < linker->file_list->len; i++) { for (i = 0; i < linker->file_list->len; i++) {
entry = &g_array_index(linker->file_list, BiosLinkerFileEntry, i); entry = &g_array_index(linker->file_list, BiosLinkerFileEntry, i);
@ -134,7 +135,6 @@ void *bios_linker_loader_cleanup(BIOSLinker *linker)
} }
g_array_free(linker->file_list, true); g_array_free(linker->file_list, true);
g_free(linker); g_free(linker);
return cmd_blob;
} }
static const BiosLinkerFileEntry * static const BiosLinkerFileEntry *

2
include/hw/acpi/bios-linker-loader.h
View File

@ -26,5 +26,5 @@ void bios_linker_loader_add_pointer(BIOSLinker *linker,
void *pointer, void *pointer,
uint8_t pointer_size); uint8_t pointer_size);
void *bios_linker_loader_cleanup(BIOSLinker *linker); void bios_linker_loader_cleanup(BIOSLinker *linker);
#endif #endif