From nobody Sun Feb 8 13:32:58 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=1618600390; cv=none; d=zohomail.com; s=zohoarc; b=THqIOBRSAt21LJRsjFTjVjeZTIHWPWICshBGk+GWZfBgRNRf4jS9cO7yK0rX5GNsp30XaAr3F1+cvhqLhSkTe99UFn36lmGVvZhaAbsfv33RwFLh8UV5P+W02BDKPXnJAx8a2hGqaQe6YL7pnJH95YtC27Qvkf49jK2jK+Tmdg8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1618600390; 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=vf4Sqd0GN6rY8Exu3uYEeo5SPd0zlPpYYMvgglnQwAw=; b=QEznejopX0LyzFmD52TJjff4jhygRK8CubfDnLud78xSH+5nljqEKmJudVXUocb2C7pLb3uz1UgBKaFPh0z/BSEQ2bRUM5eARnx7Whv7KkUmf3UTC2fz01EfDryZOHR0W8fmJVProZN43jfDLCcdKtNKf+8+GUplyyNDKf5PwfI= 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 1618600390614975.1050787778323; Fri, 16 Apr 2021 12:13:10 -0700 (PDT) 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-229-xvng5X5vMoGQaDpq-Hu0Cw-1; Fri, 16 Apr 2021 15:13:06 -0400 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 AED8E107ACCD; Fri, 16 Apr 2021 19:13: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 92BF85D74B; Fri, 16 Apr 2021 19:13: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 8BA801809C82; Fri, 16 Apr 2021 19:12:59 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 13GJCtMS028213 for ; Fri, 16 Apr 2021 15:12:55 -0400 Received: by smtp.corp.redhat.com (Postfix) id E6F075D749; Fri, 16 Apr 2021 19:12:55 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.195.130]) by smtp.corp.redhat.com (Postfix) with ESMTP id 679E65D6D3 for ; Fri, 16 Apr 2021 19:12:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1618600389; 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=vf4Sqd0GN6rY8Exu3uYEeo5SPd0zlPpYYMvgglnQwAw=; b=iJJz1HDdo6QGoBv6KZewrDMksVMFZYUf3EsxUWy/ovbUPcGCFeIfdD0IM9gEtKEJzoatgP r3ipTiM3phBAdpaGAVJVTqd5goVlgHJcVV1vBRjNW0dtKnsg/yA4jonhIxS4uRmiF+HP0L xybfefRbuqPnVlYlB6P8U5VE31AZc8A= X-MC-Unique: xvng5X5vMoGQaDpq-Hu0Cw-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 04/17] virdnsmasq: remove binaryPath argument from dnsmasqCapsNewFromBuffer Date: Fri, 16 Apr 2021 21:12:33 +0200 Message-Id: <4e534adae0f12bb6d9728e1a54a2bf31a936ee9f.1618600267.git.phrdina@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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) Content-Type: text/plain; charset="utf-8" We always pass DNSMASQ so there is no need for the argument at all. Signed-off-by: Pavel Hrdina --- src/util/virdnsmasq.c | 4 ++-- src/util/virdnsmasq.h | 3 +-- tests/networkxml2conftest.c | 6 +++--- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/util/virdnsmasq.c b/src/util/virdnsmasq.c index 89f33c22a8..82a26e83e9 100644 --- a/src/util/virdnsmasq.c +++ b/src/util/virdnsmasq.c @@ -744,9 +744,9 @@ dnsmasqCapsNewEmpty(const char *binaryPath) } =20 dnsmasqCaps * -dnsmasqCapsNewFromBuffer(const char *buf, const char *binaryPath) +dnsmasqCapsNewFromBuffer(const char *buf) { - dnsmasqCaps *caps =3D dnsmasqCapsNewEmpty(binaryPath); + dnsmasqCaps *caps =3D dnsmasqCapsNewEmpty(DNSMASQ); =20 if (!caps) return NULL; diff --git a/src/util/virdnsmasq.h b/src/util/virdnsmasq.h index 8b9474f774..cf6d50fe38 100644 --- a/src/util/virdnsmasq.h +++ b/src/util/virdnsmasq.h @@ -99,8 +99,7 @@ int dnsmasqSave(const dnsmasqContext *ctx); int dnsmasqDelete(const dnsmasqContext *ctx); int dnsmasqReload(pid_t pid); =20 -dnsmasqCaps *dnsmasqCapsNewFromBuffer(const char *buf, - const char *binaryPath); +dnsmasqCaps *dnsmasqCapsNewFromBuffer(const char *buf); dnsmasqCaps *dnsmasqCapsNewFromBinary(const char *binaryPath); bool dnsmasqCapsGet(dnsmasqCaps *caps, dnsmasqCapsFlags flag); const char *dnsmasqCapsGetBinaryPath(dnsmasqCaps *caps); diff --git a/tests/networkxml2conftest.c b/tests/networkxml2conftest.c index 402244ea4a..7444390b77 100644 --- a/tests/networkxml2conftest.c +++ b/tests/networkxml2conftest.c @@ -123,11 +123,11 @@ mymain(void) { int ret =3D 0; dnsmasqCaps *restricted - =3D dnsmasqCapsNewFromBuffer("Dnsmasq version 2.48", DNSMASQ); + =3D dnsmasqCapsNewFromBuffer("Dnsmasq version 2.48"); dnsmasqCaps *full - =3D dnsmasqCapsNewFromBuffer("Dnsmasq version 2.63\n--bind-dynamic= ", DNSMASQ); + =3D dnsmasqCapsNewFromBuffer("Dnsmasq version 2.63\n--bind-dynamic= "); dnsmasqCaps *dhcpv6 - =3D dnsmasqCapsNewFromBuffer("Dnsmasq version 2.64\n--bind-dynamic= ", DNSMASQ); + =3D dnsmasqCapsNewFromBuffer("Dnsmasq version 2.64\n--bind-dynamic= "); =20 #define DO_TEST(xname, xcaps) \ do { \ --=20 2.30.2