From nobody Sun May 5 06:54:05 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1582631210; cv=none; d=zohomail.com; s=zohoarc; b=C5gaQKzki9JX9QaTzW1vD+JB2eqmIqxdAu3x3bvHKJeAyuMy67eNc9CmQcWW9fotfjJFeAYHIh8Y8GDdFPkNgGTY0lQBNI2g90RuWaq/2vGqEZM8sBf4eCGrWY263Ylv4/lDuBNUQDY100WtBoKoSwGqM/ryfxX/U8/hyGyI+eY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1582631210; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=0g2T39ccEBGHAFCg4+Ryj91dKKxgji7UccQ1iusu+hs=; b=KCY9Z5a2li7ni6kvGnP5gyyMDcz+tJGU7Rzy5Chzsuh8d/3nwOOE0VdIJfis7d8iDgnftqJXblRBT9LKg1TDdZnRg6eOD3HuOGpp1nwEjmZUVUdfIsGr7xzhDcHkM0u9vj446vWZ+VCWSmuQGk1UqWNV2QfWZ0zhAwqYEIocTOQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 158263121011980.20476325483037; Tue, 25 Feb 2020 03:46:50 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-80-fmgzccrjMp-iEqGkQgQ7TQ-1; Tue, 25 Feb 2020 06:46:46 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 10D918017DF; Tue, 25 Feb 2020 11:46:41 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 231635C21B; Tue, 25 Feb 2020 11:46:39 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 64C1B860F4; Tue, 25 Feb 2020 11:46:37 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 01PBkZ3O001077 for ; Tue, 25 Feb 2020 06:46:35 -0500 Received: by smtp.corp.redhat.com (Postfix) id 31F1F10F1C00; Tue, 25 Feb 2020 11:46:35 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast06.extmail.prod.ext.rdu2.redhat.com [10.11.55.22]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2D5A110F1BFD for ; Tue, 25 Feb 2020 11:46:29 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id C0E53185A793 for ; Tue, 25 Feb 2020 11:46:29 +0000 (UTC) Received: from mail-pj1-f68.google.com (mail-pj1-f68.google.com [209.85.216.68]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-428-7uUxaXNMMaCTEZh8owi4rA-1; Tue, 25 Feb 2020 06:46:24 -0500 Received: by mail-pj1-f68.google.com with SMTP id q39so1178023pjc.0 for ; Tue, 25 Feb 2020 03:46:24 -0800 (PST) Received: from localhost.localdomain ([14.143.158.3]) by smtp.gmail.com with ESMTPSA id q17sm16674365pfg.123.2020.02.25.03.46.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Feb 2020 03:46:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582631208; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=0g2T39ccEBGHAFCg4+Ryj91dKKxgji7UccQ1iusu+hs=; b=agr61+iY+tZS1mVnhncuZE6XxYGoDY3wUqaSp2G/Q9mCmPLDgwtYk8lJGthj+THPSfFASN 5t+eR8FxrqYQ1PFNpNdykw5Z3BNmMPgaHCPqt69UpiZIin/RAwcEVMJfHhqAmhZdE7YAzc 1EGyJyf/frD7/Rv8AdzbkH1my4awJFE= X-MC-Unique: fmgzccrjMp-iEqGkQgQ7TQ-1 X-MC-Unique: 7uUxaXNMMaCTEZh8owi4rA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=gnQQzU1YsI8oIDL/iiIKVyqybWKZVwso4Zad6lhDxhM=; b=jPsiFs61mdcXxMeZ6kt286KlIt0c5VyH6E3vdtUWC19IzlnZJhME3yqKglHtsiGJVH 8m0tSBlunccmIKwbkGWlwscuWirKrVNpbycGtm9nDx6RsvTZLWMv0ZczxlXReWOuzhWI rQBce0dNzZUtraA0uQB0cYbGT30LN4obJAkOZJmzkn3db2j29DCNEDfcma4JqwiTepds ltwIqSAVno5lIDa6h0AWfX87I837p+bLfHWcbO13bjOZrMFRLsnKy/SrRYq+CC8mxoxz pLTyeKYJePBKnerKBYN7tqLYVavwtwSBPJGcUPdVa/BJc7inzhAn8x4Z8yaX2lFqg1td jo5Q== X-Gm-Message-State: APjAAAVGZFUQA8k+aSGEZMlT37y0VAlCf5LIqrEJ8CyqQKxNm8OFYlJy e6GuC2qsr5V+DrAU4EbtFKpil302fQk= X-Google-Smtp-Source: APXvYqx5zrE3opINXKz+1XOh4WovVqMfThs88t2YT/wYW4MU8mpbz6boBPWlRbTiDGkL4It3kJeYsg== X-Received: by 2002:a17:90a:cf07:: with SMTP id h7mr4676408pju.66.1582631182646; Tue, 25 Feb 2020 03:46:22 -0800 (PST) From: Gaurav Agrawal To: libvir-list@redhat.com Subject: [PATCH] network: bridge_driver: Use new helpers for storing libvirt errors Date: Tue, 25 Feb 2020 17:16:13 +0530 Message-Id: <20200225114613.307971-1-agrawalgaurav@gnome.org> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id 01PBkZ3O001077 X-loop: libvir-list@redhat.com Cc: GAURAV AGRAWAL X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" From: GAURAV AGRAWAL Signed-off-by: Gaurav Agrawal --- src/network/bridge_driver_linux.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/network/bridge_driver_linux.c b/src/network/bridge_driver_= linux.c index 7bbde5c6a9..ac92d884b9 100644 --- a/src/network/bridge_driver_linux.c +++ b/src/network/bridge_driver_linux.c @@ -22,6 +22,7 @@ #include =20 #include "viralloc.h" +#include "virerror.h" #include "virfile.h" #include "viriptables.h" #include "virstring.h" @@ -53,7 +54,7 @@ static void networkSetupPrivateChains(void) if (rc < 0) { VIR_DEBUG("Failed to create global IPv4 chains: %s", virGetLastErrorMessage()); - errInitV4 =3D virSaveLastError(); + virErrorPreserveLast(&errInitV4); virResetLastError(); } else { virFreeError(errInitV4); @@ -70,7 +71,7 @@ static void networkSetupPrivateChains(void) if (rc < 0) { VIR_DEBUG("Failed to create global IPv6 chains: %s", virGetLastErrorMessage()); - errInitV6 =3D virSaveLastError(); + virErrorPreserveLast(&errInitV6); virResetLastError(); } else { virFreeError(errInitV6); @@ -790,7 +791,7 @@ int networkAddFirewallRules(virNetworkDefPtr def) if (errInitV4 && (virNetworkDefGetIPByIndex(def, AF_INET, 0) || virNetworkDefGetRouteByIndex(def, AF_INET, 0))) { - virSetError(errInitV4); + virErrorRestore(&errInitV4); return -1; } =20 @@ -798,7 +799,7 @@ int networkAddFirewallRules(virNetworkDefPtr def) (virNetworkDefGetIPByIndex(def, AF_INET6, 0) || virNetworkDefGetRouteByIndex(def, AF_INET6, 0) || def->ipv6nogw)) { - virSetError(errInitV6); + virErrorRestore(&errInitV6); return -1; } =20 --=20 2.24.1