From: Jiri Denemark Date: Wed, 25 Mar 2020 10:32:44 +0000 (+0100) Subject: cpu_x86: Use g_auto* in virCPUx86Translate X-Git-Tag: v6.3.0-rc1~182 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dff59020187c34e3f814c2aa24f3832d1d5b34f9;p=thirdparty%2Flibvirt.git cpu_x86: Use g_auto* in virCPUx86Translate Signed-off-by: Jiri Denemark Reviewed-by: Ján Tomko --- diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c index 70aadfaa99..cf573b6711 100644 --- a/src/cpu/cpu_x86.c +++ b/src/cpu/cpu_x86.c @@ -3015,45 +3015,39 @@ static int virCPUx86Translate(virCPUDefPtr cpu, virDomainCapsCPUModelsPtr models) { - virCPUDefPtr translated = NULL; + g_autoptr(virCPUDef) translated = NULL; virCPUx86MapPtr map; - virCPUx86ModelPtr model = NULL; + g_autoptr(virCPUx86Model) model = NULL; size_t i; - int ret = -1; if (!(map = virCPUx86GetMap())) - goto cleanup; + return -1; if (!(model = x86ModelFromCPU(cpu, map, -1))) - goto cleanup; + return -1; if (model->vendor && virCPUx86DataAddItem(&model->data, &model->vendor->data) < 0) - goto cleanup; + return -1; if (model->signatures && x86DataAddSignature(&model->data, model->signatures[0]) < 0) - goto cleanup; + return -1; if (!(translated = virCPUDefCopyWithoutModel(cpu))) - goto cleanup; + return -1; if (x86Decode(translated, &model->data, models, NULL, false) < 0) - goto cleanup; + return -1; for (i = 0; i < cpu->nfeatures; i++) { virCPUFeatureDefPtr f = cpu->features + i; if (virCPUDefUpdateFeature(translated, f->name, f->policy) < 0) - goto cleanup; + return -1; } virCPUDefStealModel(cpu, translated, true); - ret = 0; - - cleanup: - virCPUDefFree(translated); - x86ModelFree(model); - return ret; + return 0; }