From nobody Mon Feb 9 03:52:38 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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 170.10.129.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=1642516748; cv=none; d=zohomail.com; s=zohoarc; b=QTlW2Gksr3+NN6GPd4Hhcdo+YjwOO/TBtqPTF9uRk6hmGh9udB3HnLIp7/co6o0ubyKADC329KLiIIOoPEwQzxPzHT24nctCEPgy57RBxEMz1UQmZTO5VZOdyWdt5bL6N4fnq5NsF8pBnRvCfe6GLj8ABFiCOIHaNFDo2SWXHds= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1642516748; 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=u/JuRpqZKrBaVZ73cLsTXPCLalhdh2Vmhe4dpNUqDIc=; b=lPiKIduCod9QklWPqdoPo4Gt+82Cv9LOWypoPasyA9nLiLn7bOJMcas7zvrbIj0+0iayzkPaarLcSx2DegW+7Kr+oaUSJeXDikuQZkjjDefGkvuaicigFEYgQwmuFuWL+3VCKp8KHuWfeFEksjUtlZPhKY/+8jqTyVPaBEhx6lw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1642516748345902.402023862585; Tue, 18 Jan 2022 06:39:08 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-593-R7kAUEBDNOCtMAgUdwREVw-1; Tue, 18 Jan 2022 09:39:06 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id BF0508144E0; Tue, 18 Jan 2022 14:39:00 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9F0325AB4B; Tue, 18 Jan 2022 14:39:00 +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 67F221806D2B; Tue, 18 Jan 2022 14:39:00 +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 20IEbiEm016668 for ; Tue, 18 Jan 2022 09:37:44 -0500 Received: by smtp.corp.redhat.com (Postfix) id 632AD2C1AE; Tue, 18 Jan 2022 14:37:44 +0000 (UTC) Received: from maggie.redhat.com (unknown [10.43.2.56]) by smtp.corp.redhat.com (Postfix) with ESMTP id E14182BE7F for ; Tue, 18 Jan 2022 14:37:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1642516747; 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=u/JuRpqZKrBaVZ73cLsTXPCLalhdh2Vmhe4dpNUqDIc=; b=EWpvD2nwGcr8kArCxvW0DU9y5Jp8Xpyqt1J2LtYlo0CAfNomWvXxDpr+Y9/9SWViq6WlJB L2i9TMJmCY+e9nnEeFNpZDqYjds5USeasTYbfAMNxJjMEfpDeQPneScIS/jdAxCRn7ieJL 5j5cfRoT+1MYK3kh56cosK+p1Hzv5b0= X-MC-Unique: R7kAUEBDNOCtMAgUdwREVw-1 From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH v5 06/13] virdnsmasq: Drop !caps check from dnsmasqCapsRefreshInternal() Date: Tue, 18 Jan 2022 15:37:13 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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.15 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) X-ZM-MESSAGEID: 1642516750518100001 Content-Type: text/plain; charset="utf-8" There is no way that the dnsmasqCapsRefreshInternal() function can be called with @caps =3D=3D NULL. Therefore, drop the if() that checks for that. Signed-off-by: Michal Privoznik Reviewed-by: Andrea Bolognani --- src/util/virdnsmasq.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/util/virdnsmasq.c b/src/util/virdnsmasq.c index a8fb91ed2b..9f50ce7755 100644 --- a/src/util/virdnsmasq.c +++ b/src/util/virdnsmasq.c @@ -653,9 +653,6 @@ dnsmasqCapsRefreshInternal(dnsmasqCaps *caps) g_autofree char *version =3D NULL; g_autofree char *complete =3D NULL; =20 - if (!caps) - return 0; - /* Make sure the binary we are about to try exec'ing exists. * Technically we could catch the exec() failure, but that's * in a sub-process so it's hard to feed back a useful error. --=20 2.34.1