External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-24 12:22:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

domain_conf: Separate virDomainOS clear into a function

Browse Source 
The virDomainDefFree() function frees individual members of
virDomainDef struct. The function is already long enough, move
code that handles def->os member into a separate function.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
This commit is contained in:
Michal Privoznik 2021-03-23 11:47:39 +01:00
parent 552a501d55
commit 77f8e48fc3
1 changed files with 31 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/conf/domain_conf.c
View File

@ -3527,6 +3527,36 @@ virDomainSEVDefFree(virDomainSEVDefPtr def)
g_free(def);
}
static void
virDomainOSDefClear(virDomainOSDef *os)
{
size_t i;
g_free(os->machine);
g_free(os->init);
for (i = 0; os->initargv && os->initargv[i]; i++)
g_free(os->initargv[i]);
g_free(os->initargv);
for (i = 0; os->initenv && os->initenv[i]; i++) {
g_free(os->initenv[i]->name);
g_free(os->initenv[i]->value);
g_free(os->initenv[i]);
}
g_free(os->initdir);
g_free(os->inituser);
g_free(os->initgroup);
g_free(os->initenv);
g_free(os->kernel);
g_free(os->initrd);
g_free(os->cmdline);
g_free(os->dtb);
g_free(os->root);
g_free(os->slic_table);
virDomainLoaderDefFree(os->loader);
g_free(os->bootloader);
g_free(os->bootloaderArgs);
}
void virDomainDefFree(virDomainDefPtr def)
{
@ -3640,29 +3670,7 @@ void virDomainDefFree(virDomainDefPtr def)
g_free(def->idmap.uidmap);
g_free(def->idmap.gidmap);
g_free(def->os.machine);
g_free(def->os.init);
for (i = 0; def->os.initargv && def->os.initargv[i]; i++)
g_free(def->os.initargv[i]);
g_free(def->os.initargv);
for (i = 0; def->os.initenv && def->os.initenv[i]; i++) {
g_free(def->os.initenv[i]->name);
g_free(def->os.initenv[i]->value);
g_free(def->os.initenv[i]);
}
g_free(def->os.initdir);
g_free(def->os.inituser);
g_free(def->os.initgroup);
g_free(def->os.initenv);
g_free(def->os.kernel);
g_free(def->os.initrd);
g_free(def->os.cmdline);
g_free(def->os.dtb);
g_free(def->os.root);
g_free(def->os.slic_table);
virDomainLoaderDefFree(def->os.loader);
g_free(def->os.bootloader);
g_free(def->os.bootloaderArgs);
virDomainOSDefClear(&def->os);
virDomainClockDefClear(&def->clock);