From nobody Thu Dec 18 23:01:07 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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.133.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=1639509057; cv=none; d=zohomail.com; s=zohoarc; b=NXWTnK8qjW2nsUn7P7OcMvycJisuBzyOccrHQAGCAARPgYD1z4mhdfdEFc2EW/DIlOgk/2u48ROo11onUW2VviBKG02Lo2gP3f5Mw4InBG5H7J7ZEmRGbAxh+/EJA3cOWno5XyCPnnEs7LZc0S6pqudvB13SLd/WJgliykPAtnQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1639509057; 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=+3InWmS5qkQERhYIJnKJexIJ6bAucJjqUH7OwUNsBQE=; b=KPw6wyjWN6xRF8GaYGPAQF6kio1b8MZRp4N4vEuVMg4ZsoOWiHzmIjIqvo7uTnYQQjgPmJDSl2v9NPdf5zv09HT3D+1xX2fNskjHvOJ94jxzG236hfHOLZXeWiIfsRW/V8fCjarTBT/WSYAYO8z52BBUR86HgSoET67rCaOaWRE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.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.133.124]) by mx.zohomail.com with SMTPS id 1639509057561850.492075212032; Tue, 14 Dec 2021 11:10:57 -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-206-Cn-QhXJ4P8SePoj4AE8cjw-1; Tue, 14 Dec 2021 14:10:53 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6BADF56AC6; Tue, 14 Dec 2021 19:10:48 +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 4C02710AD783; Tue, 14 Dec 2021 19:10:48 +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 1D9231802FE9; Tue, 14 Dec 2021 19:10:48 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 1BEJAloo001217 for ; Tue, 14 Dec 2021 14:10:47 -0500 Received: by smtp.corp.redhat.com (Postfix) id 5B7B4610AE; Tue, 14 Dec 2021 19:10:47 +0000 (UTC) Received: from hjs.redhat.com (unknown [10.43.2.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id D73B1610A7 for ; Tue, 14 Dec 2021 19:10:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1639509056; 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=+3InWmS5qkQERhYIJnKJexIJ6bAucJjqUH7OwUNsBQE=; b=UbNEN1Iq2q2HvDYyGV10QUb+ZyG5L8WYvr3gO87MV+1ykkscI8q2PAVyDkq/XnmPrO/AHx NYco+1ehUk8erGx/CxxO5S+zIPFQswGEY4NRKN9bFgoojHPnka95watyTF6uP6WsFmRYBL evrEXxjYggTuUmerD7oPG0JT0h8GU2Y= X-MC-Unique: Cn-QhXJ4P8SePoj4AE8cjw-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 08/17] network: assume DNSMASQ_CAPS_RA_PARAM Date: Tue, 14 Dec 2021 20:09:24 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 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.84 on 10.5.11.22 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-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1639509059023100001 Introduced by: commit c4cd95df68b573b63d234ecdb675228657d65353 Author: Simon Kelley CommitDate: 2013-10-10 20:58:11 +0100 Add --ra-param and remove --force-fast-ra git describe: v2.67rc3-3-gc4cd95d contains: v2.67rc4~12 Signed-off-by: J=C3=A1n Tomko --- src/network/bridge_driver.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index dffe4e1574..a4535b1b49 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -1197,10 +1197,8 @@ networkDnsmasqConfContents(virNetworkObj *obj, if (def->forward.type =3D=3D VIR_NETWORK_FORWARD_NONE) { virBufferAddLit(&configbuf, "dhcp-option=3D3\n" "no-resolv\n"); - if (dnsmasqCapsGet(caps, DNSMASQ_CAPS_RA_PARAM)) { - /* interface=3D* (any), interval=3D0 (default), lifetime=3D0 (= seconds) */ - virBufferAddLit(&configbuf, "ra-param=3D*,0,0\n"); - } + /* interface=3D* (any), interval=3D0 (default), lifetime=3D0 (seco= nds) */ + virBufferAddLit(&configbuf, "ra-param=3D*,0,0\n"); } =20 if (wantDNS) { --=20 2.31.1