mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2025-03-07 17:28:15 +00:00
qemu: rename virFirmware*Free() functions to have more accurate names
Several functions had the names virFirmware[something]Free(), but they aren't taking a pointer to some object and freeing it. Instead, they are making a copy of the content of an entire object, then Freeing the objects pointed to by that content. As a first step in a too-complicated cleanup just to eliminate a few occurrences of VIR_FREE(), this patch renames those functions to more accurately reflect what they do - they Free the *Content* of their arguments. Signed-off-by: Laine Stump <laine@redhat.com> Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
This commit is contained in:
parent
8626fb378c
commit
e1b02e3a56
@ -188,7 +188,7 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(qemuFirmwareOSInterface, qemuFirmwareOSInterfaceFr
|
|||||||
|
|
||||||
|
|
||||||
static void
|
static void
|
||||||
qemuFirmwareFlashFileFree(qemuFirmwareFlashFile flash)
|
qemuFirmwareFlashFileFreeContent(qemuFirmwareFlashFile flash)
|
||||||
{
|
{
|
||||||
VIR_FREE(flash.filename);
|
VIR_FREE(flash.filename);
|
||||||
VIR_FREE(flash.format);
|
VIR_FREE(flash.format);
|
||||||
@ -196,39 +196,39 @@ qemuFirmwareFlashFileFree(qemuFirmwareFlashFile flash)
|
|||||||
|
|
||||||
|
|
||||||
static void
|
static void
|
||||||
qemuFirmwareMappingFlashFree(qemuFirmwareMappingFlash flash)
|
qemuFirmwareMappingFlashFreeContent(qemuFirmwareMappingFlash flash)
|
||||||
{
|
{
|
||||||
qemuFirmwareFlashFileFree(flash.executable);
|
qemuFirmwareFlashFileFreeContent(flash.executable);
|
||||||
qemuFirmwareFlashFileFree(flash.nvram_template);
|
qemuFirmwareFlashFileFreeContent(flash.nvram_template);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static void
|
static void
|
||||||
qemuFirmwareMappingKernelFree(qemuFirmwareMappingKernel kernel)
|
qemuFirmwareMappingKernelFreeContent(qemuFirmwareMappingKernel kernel)
|
||||||
{
|
{
|
||||||
VIR_FREE(kernel.filename);
|
VIR_FREE(kernel.filename);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static void
|
static void
|
||||||
qemuFirmwareMappingMemoryFree(qemuFirmwareMappingMemory memory)
|
qemuFirmwareMappingMemoryFreeContent(qemuFirmwareMappingMemory memory)
|
||||||
{
|
{
|
||||||
VIR_FREE(memory.filename);
|
VIR_FREE(memory.filename);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static void
|
static void
|
||||||
qemuFirmwareMappingFree(qemuFirmwareMapping mapping)
|
qemuFirmwareMappingFreeContent(qemuFirmwareMapping mapping)
|
||||||
{
|
{
|
||||||
switch (mapping.device) {
|
switch (mapping.device) {
|
||||||
case QEMU_FIRMWARE_DEVICE_FLASH:
|
case QEMU_FIRMWARE_DEVICE_FLASH:
|
||||||
qemuFirmwareMappingFlashFree(mapping.data.flash);
|
qemuFirmwareMappingFlashFreeContent(mapping.data.flash);
|
||||||
break;
|
break;
|
||||||
case QEMU_FIRMWARE_DEVICE_KERNEL:
|
case QEMU_FIRMWARE_DEVICE_KERNEL:
|
||||||
qemuFirmwareMappingKernelFree(mapping.data.kernel);
|
qemuFirmwareMappingKernelFreeContent(mapping.data.kernel);
|
||||||
break;
|
break;
|
||||||
case QEMU_FIRMWARE_DEVICE_MEMORY:
|
case QEMU_FIRMWARE_DEVICE_MEMORY:
|
||||||
qemuFirmwareMappingMemoryFree(mapping.data.memory);
|
qemuFirmwareMappingMemoryFreeContent(mapping.data.memory);
|
||||||
break;
|
break;
|
||||||
case QEMU_FIRMWARE_DEVICE_NONE:
|
case QEMU_FIRMWARE_DEVICE_NONE:
|
||||||
case QEMU_FIRMWARE_DEVICE_LAST:
|
case QEMU_FIRMWARE_DEVICE_LAST:
|
||||||
@ -271,7 +271,7 @@ qemuFirmwareFree(qemuFirmwarePtr fw)
|
|||||||
return;
|
return;
|
||||||
|
|
||||||
qemuFirmwareOSInterfaceFree(fw->interfaces);
|
qemuFirmwareOSInterfaceFree(fw->interfaces);
|
||||||
qemuFirmwareMappingFree(fw->mapping);
|
qemuFirmwareMappingFreeContent(fw->mapping);
|
||||||
for (i = 0; i < fw->ntargets; i++)
|
for (i = 0; i < fw->ntargets; i++)
|
||||||
qemuFirmwareTargetFree(fw->targets[i]);
|
qemuFirmwareTargetFree(fw->targets[i]);
|
||||||
g_free(fw->targets);
|
g_free(fw->targets);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user