From: Peter Krempa <pkrempa@redhat.com>
Date: Tue, 23 Feb 2021 16:39:50 +0000 (+0100)
Subject: virfirewall: Remove impossible OOM error reporting
X-Git-Tag: v7.2.0-rc1~285
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bbc25f0d03d443efd35381463efc81b01cb6ae96;p=thirdparty%2Flibvirt.git

virfirewall: Remove impossible OOM error reporting

There's nothing that would set the 'err' field of virFirewallPtr to
ENOMEM so we can remove the checks.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Laine Stump <laine@redhat.com>
---

diff --git a/src/util/virfirewall.c b/src/util/virfirewall.c
index bbeb87e72d..c1b7d2268b 100644
--- a/src/util/virfirewall.c
+++ b/src/util/virfirewall.c
@@ -698,10 +698,6 @@ virFirewallApplyRule(virFirewallPtr firewall,
         if (rule->queryCB(firewall, rule->layer, (const char *const *)lines, rule->queryOpaque) < 0)
             return -1;
 
-        if (firewall->err == ENOMEM) {
-            virReportOOMError();
-            return -1;
-        }
         if (firewall->err) {
             virReportSystemError(firewall->err, "%s",
                                  _("Unable to create rule"));
@@ -769,11 +765,7 @@ virFirewallApply(virFirewallPtr firewall)
                        _("Failed to initialize a valid firewall backend"));
         goto cleanup;
     }
-    if (!firewall || firewall->err == ENOMEM) {
-        virReportOOMError();
-        goto cleanup;
-    }
-    if (firewall->err) {
+    if (!firewall || firewall->err) {
         virReportSystemError(firewall->err, "%s",
                              _("Unable to create rule"));
         goto cleanup;