From nobody Tue Feb 10 16:22:40 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1577977273; cv=none; d=zohomail.com; s=zohoarc; b=ADqxCxz2blwchp1W7qm4nIVk6DfVvCBMpDeW9BM/SxSSGIaM2Z0zEbv6ovNI/5rF75PqKoXhjMK2SIheovtjCbJ6wcm7616PL10lLny0sUxKVNQ7BZvCYkPu7Tn+POAG7tgPafbIMi1EqxVTdT+qdMNVz62nmLx5u6XaalyRiXo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1577977273; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=IzdFXTur4G/m4Zs+7QZH+g6RT89gk36pP+q/A1pKfbs=; b=W2EYVzP5mm9JZbX95dVl4LyEAUWMFNqiL06IrGaYWViFq7TGgMhSprL2jrt0OUqm61kF7MlLGFvZA0Jsn4AWbb2VM1sfnfW+w0ghjEtRUjT5U6Xxa9rvEDdCBwNCcmIikMjYULOVQOgZyEwdVmG5qZUdMGiCRI1gHF/Z2FWM29I= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 1577977273516282.99175448031554; Thu, 2 Jan 2020 07:01:13 -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-370-gjND43r9MEWSon2gj40qaA-1; Thu, 02 Jan 2020 10:01:07 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D8877110E111; Thu, 2 Jan 2020 15:00:58 +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 AC9D064435; Thu, 2 Jan 2020 15:00:58 +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 5CAEF81E34; Thu, 2 Jan 2020 15:00:58 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 002F0hhW005786 for ; Thu, 2 Jan 2020 10:00:43 -0500 Received: by smtp.corp.redhat.com (Postfix) id 3044519C5B; Thu, 2 Jan 2020 15:00:43 +0000 (UTC) Received: from laerte.redhat.com (unknown [10.43.2.64]) by smtp.corp.redhat.com (Postfix) with ESMTP id 80ED119C4F; Thu, 2 Jan 2020 15:00:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1577977272; 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: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=IzdFXTur4G/m4Zs+7QZH+g6RT89gk36pP+q/A1pKfbs=; b=aDR7dyuJ704/GoX4iKyCcVXjnDL7+bhuV7UPMZy4Krs/EqhgawSRogccELHDIUvcc1mR1P QXIofcjYT7DYVGO1eHRZwvXYhKDvg/GS/l8bb40HEuDPOWs6Jzf21qGRpseekO3XIIs0jI CmCk/M19KpXGvtW1l7L0K9hGKRuhzTI= From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= To: libvir-list@redhat.com Date: Thu, 2 Jan 2020 16:00:31 +0100 Message-Id: <20200102150035.1085486-2-fidencio@redhat.com> In-Reply-To: <20200102150035.1085486-1-fidencio@redhat.com> References: <20200102150035.1085486-1-fidencio@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com Cc: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Subject: [libvirt] [PATCH v2 1/5] util: Don't set/check for ENOMEM as a firewall error 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.11 X-MC-Unique: gjND43r9MEWSon2gj40qaA-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) As libvirt decided to take the path to not report OOM and simply abort when it happens, let's not set nor check for ENOMEM firewall's error and simplify the code whenever it's possible. Signed-off-by: Fabiano Fid=C3=AAncio --- src/util/virfirewall.c | 30 ++++++------------------------ 1 file changed, 6 insertions(+), 24 deletions(-) diff --git a/src/util/virfirewall.c b/src/util/virfirewall.c index ee72b579e4..6f7b5306e5 100644 --- a/src/util/virfirewall.c +++ b/src/util/virfirewall.c @@ -391,7 +391,6 @@ virFirewallAddRuleFullV(virFirewallPtr firewall, return rule; =20 no_memory: - firewall->err =3D ENOMEM; virFirewallRuleFree(rule); return NULL; } @@ -492,10 +491,8 @@ void virFirewallRuleAddArg(virFirewallPtr firewall, =20 ADD_ARG(rule, arg); =20 - return; - no_memory: - firewall->err =3D ENOMEM; + return; } =20 =20 @@ -514,10 +511,8 @@ void virFirewallRuleAddArgFormat(virFirewallPtr firewa= ll, =20 ADD_ARG(rule, arg); =20 - return; - no_memory: - firewall->err =3D ENOMEM; + return; } =20 =20 @@ -532,10 +527,8 @@ void virFirewallRuleAddArgSet(virFirewallPtr firewall, args++; } =20 - return; - no_memory: - firewall->err =3D ENOMEM; + return; } =20 =20 @@ -553,12 +546,7 @@ void virFirewallRuleAddArgList(virFirewallPtr firewall, while ((str =3D va_arg(list, char *)) !=3D NULL) ADD_ARG(rule, str); =20 - va_end(list); - - return; - no_memory: - firewall->err =3D ENOMEM; va_end(list); } =20 @@ -591,15 +579,13 @@ void virFirewallStartTransaction(virFirewallPtr firew= all, =20 VIR_FIREWALL_RETURN_IF_ERROR(firewall); =20 - if (!(group =3D virFirewallGroupNew())) { - firewall->err =3D ENOMEM; + if (!(group =3D virFirewallGroupNew())) return; - } + group->actionFlags =3D flags; =20 if (VIR_EXPAND_N(firewall->groups, firewall->ngroups, 1) < 0) { - firewall->err =3D ENOMEM; virFirewallGroupFree(group); return; } @@ -747,10 +733,6 @@ virFirewallApplyRule(virFirewallPtr firewall, if (rule->queryCB(firewall, rule->layer, (const char *const *)line= s, rule->queryOpaque) < 0) return -1; =20 - if (firewall->err =3D=3D ENOMEM) { - virReportOOMError(); - return -1; - } if (firewall->err) { virReportSystemError(firewall->err, "%s", _("Unable to create rule")); @@ -818,7 +800,7 @@ virFirewallApply(virFirewallPtr firewall) _("Failed to initialize a valid firewall backend")); goto cleanup; } - if (!firewall || firewall->err =3D=3D ENOMEM) { + if (!firewall) { virReportOOMError(); goto cleanup; } --=20 2.24.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list