[libvirt PATCH 16/39] cpu_x86: Use g_auto* in virCPUx86Compare

[Ján Tomko]

On a Friday in 2020, Jiri Denemark wrote:
>Signed-off-by: Jiri Denemark <jdenemar at redhat.com>
>---
> src/cpu/cpu_x86.c | 19 ++++++++-----------
> 1 file changed, 8 insertions(+), 11 deletions(-)
>
>diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
>index 6758fcc170..e4e21fbed4 100644
>--- a/src/cpu/cpu_x86.c
>+++ b/src/cpu/cpu_x86.c
>@@ -1848,34 +1848,31 @@ virCPUx86Compare(virCPUDefPtr host,
>                  virCPUDefPtr cpu,
>                  bool failIncompatible)
> {
>-    virCPUCompareResult ret = VIR_CPU_COMPARE_ERROR;
>-    virCPUx86ModelPtr model = NULL;
>-    char *message = NULL;
>+    virCPUCompareResult ret;
>+    g_autoptr(virCPUx86Model) model = NULL;

As mentioned earlier, model is no longer used here.

>+    g_autofree char *message = NULL;
>
>     if (!host || !host->model) {
>         if (failIncompatible) {
>             virReportError(VIR_ERR_CPU_INCOMPATIBLE, "%s",
>                            _("unknown host CPU"));
>-        } else {
>-            VIR_WARN("unknown host CPU");
>-            ret = VIR_CPU_COMPARE_INCOMPATIBLE;
>+            return VIR_CPU_COMPARE_ERROR;
>         }
>-        goto cleanup;
>+
>+        VIR_WARN("unknown host CPU");
>+        return VIR_CPU_COMPARE_INCOMPATIBLE;
>     }
>
>     ret = x86Compute(host, cpu, NULL, &message);
>

Reviewed-by: Ján Tomko <jtomko at redhat.com>

Jano
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 488 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20200407/b91b0971/attachment-0001.sig>