Re: [libvirt PATCH 25/39] cpu_x86: Use g_auto* in virCPUx86UpdateLive

[Ján Tomko]

On a Friday in 2020, Jiri Denemark wrote:

Signed-off-by: Jiri Denemark 
---
src/cpu/cpu_x86.c | 42 +++---
1 file changed, 15 insertions(+), 27 deletions(-)



Reviewed-by: Ján Tomko 

Jano


signature.asc
Description: PGP signature

[libvirt PATCH 25/39] cpu_x86: Use g_auto* in virCPUx86UpdateLive

[Jiri Denemark]

Signed-off-by: Jiri Denemark 
---
 src/cpu/cpu_x86.c | 42 +++---
 1 file changed, 15 insertions(+), 27 deletions(-)

diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
index 8da8b3ada2..0be2cf517d 100644
--- a/src/cpu/cpu_x86.c
+++ b/src/cpu/cpu_x86.c
@@ -2901,26 +2901,25 @@ virCPUx86UpdateLive(virCPUDefPtr cpu,
 {
 bool hostPassthrough = cpu->mode == VIR_CPU_MODE_HOST_PASSTHROUGH;
 virCPUx86MapPtr map;
-virCPUx86ModelPtr model = NULL;
-virCPUx86ModelPtr modelDisabled = NULL;
-virCPUx86Data enabled = VIR_CPU_X86_DATA_INIT;
-virCPUx86Data disabled = VIR_CPU_X86_DATA_INIT;
-virBuffer bufAdded = VIR_BUFFER_INITIALIZER;
-virBuffer bufRemoved = VIR_BUFFER_INITIALIZER;
-char *added = NULL;
-char *removed = NULL;
+g_autoptr(virCPUx86Model) model = NULL;
+g_autoptr(virCPUx86Model) modelDisabled = NULL;
+g_auto(virCPUx86Data) enabled = VIR_CPU_X86_DATA_INIT;
+g_auto(virCPUx86Data) disabled = VIR_CPU_X86_DATA_INIT;
+g_auto(virBuffer) bufAdded = VIR_BUFFER_INITIALIZER;
+g_auto(virBuffer) bufRemoved = VIR_BUFFER_INITIALIZER;
+g_autofree char *added = NULL;
+g_autofree char *removed = NULL;
 size_t i;
-int ret = -1;
 
 if (!(map = virCPUx86GetMap()))
 return -1;
 
 if (!(model = x86ModelFromCPU(cpu, map, -1)))
-goto cleanup;
+return -1;
 
 if (hostPassthrough &&
 !(modelDisabled = x86ModelFromCPU(cpu, map, VIR_CPU_FEATURE_DISABLE)))
-goto cleanup;
+return -1;
 
 if (dataEnabled)
 x86DataCopy(, >data.x86);
@@ -2945,7 +2944,7 @@ virCPUx86UpdateLive(virCPUDefPtr cpu,
 virBufferAsprintf(, "%s,", feature->name);
 else if (virCPUDefUpdateFeature(cpu, feature->name,
 VIR_CPU_FEATURE_REQUIRE) < 0)
-goto cleanup;
+return -1;
 }
 
 if (x86DataIsSubset(, >data) ||
@@ -2956,7 +2955,7 @@ virCPUx86UpdateLive(virCPUDefPtr cpu,
 virBufferAsprintf(, "%s,", feature->name);
 else if (virCPUDefUpdateFeature(cpu, feature->name,
 VIR_CPU_FEATURE_DISABLE) < 0)
-goto cleanup;
+return -1;
 }
 }
 
@@ -2982,28 +2981,17 @@ virCPUx86UpdateLive(virCPUDefPtr cpu,
_("guest CPU doesn't match specification: "
  "missing features: %s"),
removed);
-goto cleanup;
+return -1;
 }
 
 if (cpu->check == VIR_CPU_CHECK_FULL &&
 !x86DataIsEmpty()) {
 virReportError(VIR_ERR_OPERATION_FAILED, "%s",
_("guest CPU doesn't match specification"));
-goto cleanup;
+return -1;
 }
 
-ret = 0;
-
- cleanup:
-x86ModelFree(model);
-x86ModelFree(modelDisabled);
-virCPUx86DataClear();
-virCPUx86DataClear();
-VIR_FREE(added);
-VIR_FREE(removed);
-virBufferFreeAndReset();
-virBufferFreeAndReset();
-return ret;
+return 0;
 }
 
 
-- 
2.26.0