[libvirt] [PATCH] qemu: Reset error if we're not going to error label

[Ján Tomko]

On Tue, Jul 19, 2016 at 11:00:56AM +0200, Martin Kletzander wrote:
>Signed-off-by: Martin Kletzander <mkletzan at redhat.com>
>---
> src/qemu/qemu_conf.c | 7 +++++--
> 1 file changed, 5 insertions(+), 2 deletions(-)
>
>diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
>index fa9d65e91967..2a889381090f 100644
>--- a/src/qemu/qemu_conf.c
>+++ b/src/qemu/qemu_conf.c
>@@ -266,8 +266,11 @@ virQEMUDriverConfigPtr virQEMUDriverConfigNew(bool privileged)
>         virFileFindHugeTLBFS(&cfg->hugetlbfs, &cfg->nhugetlbfs) < 0) {
>         /* This however is not implemented on all platforms. */
>         virErrorPtr err = virGetLastError();
>-        if (err && err->code != VIR_ERR_NO_SUPPORT)
>-            goto error;
>+        if (err) {
>+            if (err->code == VIR_ERR_NO_SUPPORT)
>+                virResetError(err);

This does not unlog the error.

If it's fatal, we should not be ignoring it.
If it's not, we should not have logged it in the first place.

Jan

>+            else
>+                goto error;
>     }
>
>     if (VIR_STRDUP(cfg->bridgeHelperName, QEMU_BRIDGE_HELPER) < 0)
>-- 
>2.9.2
>
>--
>libvir-list mailing list
>libvir-list at redhat.com
>https://www.redhat.com/mailman/listinfo/libvir-list