From nobody Sun Feb 8 19:03:05 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 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=1614183482; cv=none; d=zohomail.com; s=zohoarc; b=K/zDSiRk/TZWnsF4zZBftc8xedPc1M/CvWJ43AASpoLP9LmNzlcdMx4LVKB3rVPSOEFkzm6E3KzBtdINkbf3vLSqBLggAIdfBxqUNOeMz9/DYfxKKtOMn8ccRkTl7gE6XVFz40pzeSwIPAaifcVn4YCtfHyNGyOF18vNgEuPk7w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614183482; h=Content-Type:Content-Transfer-Encoding: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=6mFa5IpS5tbVpsUGto47sHsGxCUji21+2Pua1jodiec=; b=ijj5UKAGLSOhzqVG0gAl+rP+izzwCH6z9uCSjsbtB+CV4BOTtDOFLu9mgRvyCZx9eP8GvT2na1rsgPwHh7bITfAU3hN4wKXUfp/nzc+WHRkK2Caw00ASJJT+Of9L8BbmcLjBtqILI9zmRZzrXAMn1PiDyaTonxYhsQ+oTWJ2x8Y= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 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-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1614183482993380.0731414689993; Wed, 24 Feb 2021 08:18:02 -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-353-ayY4IEpNMsW7fGYah0GZKA-1; Wed, 24 Feb 2021 11:17:58 -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 787F8100CC8E; Wed, 24 Feb 2021 16:17:51 +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 513084F3C6; Wed, 24 Feb 2021 16:17:51 +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 13F5658085; Wed, 24 Feb 2021 16:17:51 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 11OGHfNR015625 for ; Wed, 24 Feb 2021 11:17:41 -0500 Received: by smtp.corp.redhat.com (Postfix) id 2104760862; Wed, 24 Feb 2021 16:17:41 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.53]) by smtp.corp.redhat.com (Postfix) with ESMTP id 73C0A60D79 for ; Wed, 24 Feb 2021 16:17:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1614183481; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to: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=6mFa5IpS5tbVpsUGto47sHsGxCUji21+2Pua1jodiec=; b=Z6QfScbXo2Djq2g0ZMfilgeBN3s6px3jqj6oWP2uCPk5BHZvXooQH3PqbIx0SEXGwysW36 vD3Dcsb5PHOs3Fm9pbvxigjFw2yzw1P363ec0kbEKU0H+JG22Rm608eFLrrSV51jPd6+sW RXwfN7B3u7NFrI/9Hq3O+AkCGJccxLM= X-MC-Unique: ayY4IEpNMsW7fGYah0GZKA-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 16/33] virfirewall: Remove impossible OOM error reporting Date: Wed, 24 Feb 2021 17:16:51 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com 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 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com 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" There's nothing that would set the 'err' field of virFirewallPtr to ENOMEM so we can remove the checks. Signed-off-by: Peter Krempa --- src/util/virfirewall.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) 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 *)line= s, rule->queryOpaque) < 0) return -1; - if (firewall->err =3D=3D 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 =3D=3D ENOMEM) { - virReportOOMError(); - goto cleanup; - } - if (firewall->err) { + if (!firewall || firewall->err) { virReportSystemError(firewall->err, "%s", _("Unable to create rule")); goto cleanup; --=20 2.29.2