Re: [libvirt PATCH 27/39] cpu_x86: Use g_auto* in virCPUx86ExpandFeatures

[Ján Tomko]

On a Friday in 2020, Jiri Denemark wrote:

Signed-off-by: Jiri Denemark 
---
src/cpu/cpu_x86.c | 22 --
1 file changed, 8 insertions(+), 14 deletions(-)



Reviewed-by: Ján Tomko 

Jano


signature.asc
Description: PGP signature

[libvirt PATCH 27/39] cpu_x86: Use g_auto* in virCPUx86ExpandFeatures

[Jiri Denemark]

Signed-off-by: Jiri Denemark 
---
 src/cpu/cpu_x86.c | 22 --
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
index 3f6d889722..a65215caed 100644
--- a/src/cpu/cpu_x86.c
+++ b/src/cpu/cpu_x86.c
@@ -3059,30 +3059,29 @@ static int
 virCPUx86ExpandFeatures(virCPUDefPtr cpu)
 {
 virCPUx86MapPtr map;
-virCPUDefPtr expanded = NULL;
-virCPUx86ModelPtr model = NULL;
+g_autoptr(virCPUDef) expanded = NULL;
+g_autoptr(virCPUx86Model) model = NULL;
 bool host = cpu->type == VIR_CPU_TYPE_HOST;
 size_t i;
-int ret = -1;
 
 if (!(map = virCPUx86GetMap()))
-goto cleanup;
+return -1;
 
 if (!(expanded = virCPUDefCopy(cpu)))
-goto cleanup;
+return -1;
 
 virCPUDefFreeFeatures(expanded);
 
 if (!(model = x86ModelFind(map, cpu->model))) {
 virReportError(VIR_ERR_INTERNAL_ERROR,
_("unknown CPU model %s"), cpu->model);
-goto cleanup;
+return -1;
 }
 
 if (!(model = x86ModelCopy(model)) ||
 x86DataToCPUFeatures(expanded, host ? -1 : VIR_CPU_FEATURE_REQUIRE,
  >data, map) < 0)
-goto cleanup;
+return -1;
 
 for (i = 0; i < cpu->nfeatures; i++) {
 virCPUFeatureDefPtr f = cpu->features + i;
@@ -3093,17 +3092,12 @@ virCPUx86ExpandFeatures(virCPUDefPtr cpu)
 continue;
 
 if (virCPUDefUpdateFeature(expanded, f->name, f->policy) < 0)
-goto cleanup;
+return -1;
 }
 
 virCPUDefFreeModel(cpu);
 
-ret = virCPUDefCopyModel(cpu, expanded, false);
-
- cleanup:
-virCPUDefFree(expanded);
-x86ModelFree(model);
-return ret;
+return virCPUDefCopyModel(cpu, expanded, false);
 }
 
 
-- 
2.26.0