External/libvirt
1
0
Fork 0
Code

cpu_ppc64.c: use g_autoptr() with virCPUppc64ModelPtr

Browse Source 
Use autocleanup with virCPUppc64ModelPtr to simplify existing
code. Remove the 'error' label in ppc64ModelCopy() since it is
now obsolete.

Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
Signed-off-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Daniel Henrique Barboza 2020-09-02 17:25:40 -03:00 committed by Ján Tomko
parent 5cf09b579f
commit 93c1e64a16
1 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/cpu/cpu_ppc64.c
View File

@ -185,23 +185,19 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(virCPUppc64Model, ppc64ModelFree);
static virCPUppc64ModelPtr static virCPUppc64ModelPtr
ppc64ModelCopy(const virCPUppc64Model *model) ppc64ModelCopy(const virCPUppc64Model *model)
{ {
virCPUppc64ModelPtr copy; g_autoptr(virCPUppc64Model) copy = NULL;
if (VIR_ALLOC(copy) < 0) if (VIR_ALLOC(copy) < 0)
goto error; return NULL;
copy->name = g_strdup(model->name); copy->name = g_strdup(model->name);
if (ppc64DataCopy(&copy->data, &model->data) < 0) if (ppc64DataCopy(&copy->data, &model->data) < 0)
goto error; return NULL;
copy->vendor = model->vendor; copy->vendor = model->vendor;
return copy; return g_steal_pointer(&copy);
error:
ppc64ModelFree(copy);
return NULL;
} }
static virCPUppc64ModelPtr static virCPUppc64ModelPtr
@ -308,7 +304,7 @@ ppc64ModelParse(xmlXPathContextPtr ctxt,
void *data) void *data)
{ {
struct ppc64_map *map = data; struct ppc64_map *map = data;
virCPUppc64ModelPtr model; g_autoptr(virCPUppc64Model) model = NULL;
xmlNodePtr *nodes = NULL; xmlNodePtr *nodes = NULL;
char *vendor = NULL; char *vendor = NULL;
unsigned long pvr; unsigned long pvr;
@ -382,7 +378,6 @@ ppc64ModelParse(xmlXPathContextPtr ctxt,
ret = 0; ret = 0;
cleanup: cleanup:
ppc64ModelFree(model);
VIR_FREE(vendor); VIR_FREE(vendor);
VIR_FREE(nodes); VIR_FREE(nodes);
return ret; return ret;
@ -431,8 +426,8 @@ ppc64Compute(virCPUDefPtr host,
char **message) char **message)
{ {
struct ppc64_map *map = NULL; struct ppc64_map *map = NULL;
virCPUppc64ModelPtr host_model = NULL; g_autoptr(virCPUppc64Model) host_model = NULL;
virCPUppc64ModelPtr guest_model = NULL; g_autoptr(virCPUppc64Model) guest_model = NULL;
virCPUDefPtr cpu = NULL; virCPUDefPtr cpu = NULL;
virCPUCompareResult ret = VIR_CPU_COMPARE_ERROR; virCPUCompareResult ret = VIR_CPU_COMPARE_ERROR;
virArch arch; virArch arch;
@ -545,8 +540,6 @@ ppc64Compute(virCPUDefPtr host,
cleanup: cleanup:
virCPUDefFree(cpu); virCPUDefFree(cpu);
ppc64MapFree(map); ppc64MapFree(map);
ppc64ModelFree(host_model);
ppc64ModelFree(guest_model);
return ret; return ret;
} }