[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 19/25] acpi: cleanup bios_linker_loader_cleanup()
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 19/25] acpi: cleanup bios_linker_loader_cleanup() |
Date: |
Sun, 5 Jun 2016 16:21:53 +0300 |
From: Igor Mammedov <address@hidden>
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 <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
include/hw/acpi/bios-linker-loader.h | 2 +-
hw/acpi/aml-build.c | 3 +--
hw/acpi/bios-linker-loader.c | 8 +++-----
3 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/include/hw/acpi/bios-linker-loader.h
b/include/hw/acpi/bios-linker-loader.h
index bee6dee..564e192 100644
--- a/include/hw/acpi/bios-linker-loader.h
+++ b/include/hw/acpi/bios-linker-loader.h
@@ -26,5 +26,5 @@ void bios_linker_loader_add_pointer(BIOSLinker *linker,
void *pointer,
uint8_t pointer_size);
-void *bios_linker_loader_cleanup(BIOSLinker *linker);
+void bios_linker_loader_cleanup(BIOSLinker *linker);
#endif
diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c
index bff2599..66e9bf8 100644
--- a/hw/acpi/aml-build.c
+++ b/hw/acpi/aml-build.c
@@ -1548,8 +1548,7 @@ void acpi_build_tables_init(AcpiBuildTables *tables)
void acpi_build_tables_cleanup(AcpiBuildTables *tables, bool mfre)
{
- void *linker_data = bios_linker_loader_cleanup(tables->linker);
- g_free(linker_data);
+ bios_linker_loader_cleanup(tables->linker);
g_array_free(tables->rsdp, true);
g_array_free(tables->table_data, true);
g_array_free(tables->tcpalog, mfre);
diff --git a/hw/acpi/bios-linker-loader.c b/hw/acpi/bios-linker-loader.c
index a2f20ec..7a2e4d2 100644
--- a/hw/acpi/bios-linker-loader.c
+++ b/hw/acpi/bios-linker-loader.c
@@ -128,14 +128,12 @@ BIOSLinker *bios_linker_loader_init(void)
return linker;
}
-/* Free linker wrapper and return the linker commands array. */
-void *bios_linker_loader_cleanup(BIOSLinker *linker)
+/* Free linker wrapper */
+void bios_linker_loader_cleanup(BIOSLinker *linker)
{
- void *cmd_blob = g_array_free(linker->cmd_blob, false);
-
+ g_array_free(linker->cmd_blob, true);
g_array_free(linker->file_list, true);
g_free(linker);
- return cmd_blob;
}
static const BiosLinkerFileEntry *
--
MST
- [Qemu-devel] [PULL 10/25] pc: acpi: simplify build_legacy_cpu_hotplug_aml() signature, (continued)
- [Qemu-devel] [PULL 10/25] pc: acpi: simplify build_legacy_cpu_hotplug_aml() signature, Michael S. Tsirkin, 2016/06/05
- [Qemu-devel] [PULL 08/25] pc: acpi: mark current CPU hotplug functions as legacy, Michael S. Tsirkin, 2016/06/05
- [Qemu-devel] [PULL 09/25] pc: acpi: consolidate legacy CPU hotplug in one file, Michael S. Tsirkin, 2016/06/05
- [Qemu-devel] [PULL 11/25] pc: acpi: cpuhp-legacy: switch ProcessorID to possible_cpus idx, Michael S. Tsirkin, 2016/06/05
- [Qemu-devel] [PULL 12/25] tests: acpi: update tables with consolidated legacy cpu-hotplug AML, Michael S. Tsirkin, 2016/06/05
- [Qemu-devel] [PULL 13/25] ipmi: rework the fwinfo to be fetched from the interface, Michael S. Tsirkin, 2016/06/05
- [Qemu-devel] [PULL 14/25] pc: Postpone SMBIOS table installation to post machine init, Michael S. Tsirkin, 2016/06/05
- [Qemu-devel] [PULL 15/25] acpi: extend ACPI interface to provide send_event hook, Michael S. Tsirkin, 2016/06/05
- [Qemu-devel] [PULL 16/25] pc: use AcpiDeviceIfClass.send_event to issue GPE events, Michael S. Tsirkin, 2016/06/05
- [Qemu-devel] [PULL 20/25] tpm: apci: cleanup TCPA table initialization, Michael S. Tsirkin, 2016/06/05
- [Qemu-devel] [PULL 19/25] acpi: cleanup bios_linker_loader_cleanup(),
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 17/25] acpi: convert linker from GArray to BIOSLinker structure, Michael S. Tsirkin, 2016/06/05
- [Qemu-devel] [PULL 23/25] pc-dimm: get memory region from ->get_memory_region(), Michael S. Tsirkin, 2016/06/05
- [Qemu-devel] [PULL 18/25] acpi: simplify bios_linker API by removing redundant 'table' argument, Michael S. Tsirkin, 2016/06/05
- [Qemu-devel] [PULL 24/25] pc-dimm: introduce realize callback, Michael S. Tsirkin, 2016/06/05
- [Qemu-devel] [PULL 22/25] acpi: make bios_linker_loader_add_checksum() API offset based, Michael S. Tsirkin, 2016/06/05
- [Qemu-devel] [PULL 21/25] acpi: make bios_linker_loader_add_pointer() API offset based, Michael S. Tsirkin, 2016/06/05
- [Qemu-devel] [PULL 25/25] virtio: move bi-endian target support to a single location, Michael S. Tsirkin, 2016/06/05
- Re: [Qemu-devel] [PULL 00/25] pc, pci, virtio: new features, cleanups, fixes, Peter Maydell, 2016/06/06