From nobody Sun May 5 23:27:13 2024 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=1639509005; cv=none; d=zohomail.com; s=zohoarc; b=X40WVhv+yKTjASynv83q42LGO54gqRR5vGSEsMjynkafdNFuDmV90iiN6iGbWniHQ1yMWIcDzt02Fu8t5pxKLGW/bCyXu/BcIAs9kgvqAH0h3r95OMG9mc0T5WOajUxTgQe0ynQsF7+rRXm0HeHD6nQxPAdcc+Zf/JNFHzg5D0c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1639509005; 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=14OOwLzEPW65sXiREgU/XPRrTy5GJA0ordDckyKGyaA=; b=Kw8W94x+7rgBM7Gg8PhBxoV74eThqjnMxDcDRICRQgcPvnyRQpswtGS/JzDbodGIG720J1oHkWKeSwgyQmNIfXCN7LnY6/kOn1lungMo7Lcy/Bphtn93GNQS/isS+0IxpsBCQ586AH5TcaIRIBbRN+cQcqrlOZwpeqJh4AAG4QY= 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 1639509005286900.6019691434905; Tue, 14 Dec 2021 11:10:05 -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-333-86xAF94mMPeunvyXp9NjDA-1; Tue, 14 Dec 2021 14:10:01 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 32B553E741; Tue, 14 Dec 2021 19:09:56 +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 0A7105DF3A; Tue, 14 Dec 2021 19:09:56 +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 E04E14BB7C; Tue, 14 Dec 2021 19:09:54 +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 1BEJ9qQm000788 for ; Tue, 14 Dec 2021 14:09:52 -0500 Received: by smtp.corp.redhat.com (Postfix) id A0B0A18A4E; Tue, 14 Dec 2021 19:09:52 +0000 (UTC) Received: from hjs.redhat.com (unknown [10.43.2.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 27C65610A7 for ; Tue, 14 Dec 2021 19:09:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1639509004; 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=14OOwLzEPW65sXiREgU/XPRrTy5GJA0ordDckyKGyaA=; b=bYzr40betPK8pausNOuOLGsDSXbjS1Q+hN8GXIow2UUEUYze18juzO5A0lSlCY0zz+yoxd ksySGDectzANCldGAcKWfkwoTxShyj+AQMCZxzJLi8gAYLH0dx3VaP9x2GkDWUy9IRri+w mVjWqjmaQMd79v4WQ8YFIkcMICZ5jro= X-MC-Unique: 86xAF94mMPeunvyXp9NjDA-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 01/17] util: dnsmasqCapsSetFromBuffer: use error label Date: Tue, 14 Dec 2021 20:09:17 +0100 Message-Id: <40f8c0009cfea59eb5f5495d1a2f2104d3664247.1639508754.git.jtomko@redhat.com> 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.79 on 10.5.11.14 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: 1639509006375100001 Rename 'fail' to 'error' to match the prevalent usage. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Laine Stump --- src/util/virdnsmasq.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/util/virdnsmasq.c b/src/util/virdnsmasq.c index b62e353ceb..90a1ea35b6 100644 --- a/src/util/virdnsmasq.c +++ b/src/util/virdnsmasq.c @@ -620,12 +620,12 @@ dnsmasqCapsSetFromBuffer(dnsmasqCaps *caps, const cha= r *buf) =20 p =3D STRSKIP(buf, DNSMASQ_VERSION_STR); if (!p) - goto fail; + goto error; =20 virSkipToDigit(&p); =20 if (virParseVersionString(p, &caps->version, true) < 0) - goto fail; + goto error; =20 if (strstr(buf, "--bind-dynamic")) dnsmasqCapsSet(caps, DNSMASQ_CAPS_BIND_DYNAMIC); @@ -650,7 +650,7 @@ dnsmasqCapsSetFromBuffer(dnsmasqCaps *caps, const char = *buf) dnsmasqCapsGet(caps, DNSMASQ_CAPS_RA_PARAM) ? "" : "NOT "); return 0; =20 - fail: + error: p =3D strchr(buf, '\n'); if (!p) len =3D strlen(buf); --=20 2.31.1 From nobody Sun May 5 23:27:13 2024 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=1639509013; cv=none; d=zohomail.com; s=zohoarc; b=OZUBYNYLeUs+wmDpUdRoMU6PCwcSOHuq9ah1uyQtyOsvWv/L23HKhrY3JGLToue/40JAYeKyOWdOdazpIxMiP5X2XNlAjVepO+drz45ALsV6g48Oro7SEi8E867phMhMUka0vXNQNd8fqz+SF7uItl34lzv1OENej/qrt+JzNc4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1639509013; 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=9FYa8X0VFvXxpHbbMkyhfP6Spjq4Jh3XFFB5NrTat5M=; b=euahqQ7g4Jl32h0WDow3+KSEG5qtk8hfT3F+8mBm1dAnqSN0rsDNUKsoO0wCUG5L/Md46vaoIS+A1p78beGsSBsEBrb4lpb9PFnD1+35u9BVFRUSq7doV8LlcqXDvB31g3Oy+JdypdGWblbTrn3rMYz/9zLUWxMR1JD585JdmIM= 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 1639509013342571.0020580740421; Tue, 14 Dec 2021 11:10:13 -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-179-o3Ud4K9TPMyvGXSiOzgTrQ-1; Tue, 14 Dec 2021 14:10:10 -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 D71FB81EE63; Tue, 14 Dec 2021 19:10:04 +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 B17A010AD785; Tue, 14 Dec 2021 19:10:04 +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 75F7A1806D2E; Tue, 14 Dec 2021 19:10:04 +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 1BEJ9rh8000796 for ; Tue, 14 Dec 2021 14:09:53 -0500 Received: by smtp.corp.redhat.com (Postfix) id 7390B18A4E; Tue, 14 Dec 2021 19:09:53 +0000 (UTC) Received: from hjs.redhat.com (unknown [10.43.2.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id EEC57610A7 for ; Tue, 14 Dec 2021 19:09:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1639509012; 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=9FYa8X0VFvXxpHbbMkyhfP6Spjq4Jh3XFFB5NrTat5M=; b=KreQAGO9RM5RyCik1392DfuVp91wBVK8OlMdkDWsArEyZjwi/kv5PiKSpW19IOmUD6u3pE VSK1gArgI2DYbWteMHkuhjeUnH7xujqaIyXLv49s9MNHMRIXLvro7nfo3kP2gK9SEN77+/ Lh8aYbAxWFV7POJOpQB7hoUGbe+JTzE= X-MC-Unique: o3Ud4K9TPMyvGXSiOzgTrQ-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 02/17] tests: do not test dnsmasq older than 2.67 Date: Tue, 14 Dec 2021 20:09:18 +0100 Message-Id: <93eb08ad90fbb20d0033039d21fdce89aa7d8616.1639508754.git.jtomko@redhat.com> 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: 1639509014221100001 Prepare to retire older versions by droping older tests. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Laine Stump --- .../networkxml2confdata/isolated-network.conf | 5 +-- .../nat-network-dns-srv-record-minimal.conf | 10 +++--- .../nat-network-dns-srv-record.conf | 2 ++ .../nat-network-dns-txt-record.conf | 2 ++ .../nat-network-name-with-quotes.conf | 10 +++--- .../networkxml2confdata/netboot-network.conf | 4 +-- .../netboot-proxy-network.conf | 4 +-- tests/networkxml2conftest.c | 32 ++++++++----------- 8 files changed, 32 insertions(+), 37 deletions(-) diff --git a/tests/networkxml2confdata/isolated-network.conf b/tests/networ= kxml2confdata/isolated-network.conf index 693a83d9a0..ea66bb83e6 100644 --- a/tests/networkxml2confdata/isolated-network.conf +++ b/tests/networkxml2confdata/isolated-network.conf @@ -6,10 +6,11 @@ ## dnsmasq conf file created by libvirt strict-order except-interface=3Dlo -bind-interfaces -listen-address=3D192.168.152.1 +bind-dynamic +interface=3Dvirbr2 dhcp-option=3D3 no-resolv +ra-param=3D*,0,0 dhcp-range=3D192.168.152.2,192.168.152.254,255.255.255.0 dhcp-no-override dhcp-authoritative diff --git a/tests/networkxml2confdata/nat-network-dns-srv-record-minimal.c= onf b/tests/networkxml2confdata/nat-network-dns-srv-record-minimal.conf index 0b2ca6f5aa..bd560ba3f4 100644 --- a/tests/networkxml2confdata/nat-network-dns-srv-record-minimal.conf +++ b/tests/networkxml2confdata/nat-network-dns-srv-record-minimal.conf @@ -6,12 +6,8 @@ ## dnsmasq conf file created by libvirt strict-order except-interface=3Dlo -bind-interfaces -listen-address=3D192.168.122.1 -listen-address=3D192.168.123.1 -listen-address=3Dfc00:db8:ac10:fe01::1 -listen-address=3Dfc00:db8:ac10:fd01::1 -listen-address=3D10.24.10.1 +bind-dynamic +interface=3Dvirbr0 srv-host=3D_name._tcp dhcp-range=3D192.168.122.2,192.168.122.254,255.255.255.0 dhcp-no-override @@ -19,3 +15,5 @@ dhcp-authoritative dhcp-lease-max=3D253 dhcp-hostsfile=3D/var/lib/libvirt/dnsmasq/default.hostsfile addn-hosts=3D/var/lib/libvirt/dnsmasq/default.addnhosts +dhcp-range=3Dfc00:db8:ac10:fe01::1,ra-only +dhcp-range=3Dfc00:db8:ac10:fd01::1,ra-only diff --git a/tests/networkxml2confdata/nat-network-dns-srv-record.conf b/te= sts/networkxml2confdata/nat-network-dns-srv-record.conf index a18c09aaa7..22bf3b1de9 100644 --- a/tests/networkxml2confdata/nat-network-dns-srv-record.conf +++ b/tests/networkxml2confdata/nat-network-dns-srv-record.conf @@ -21,3 +21,5 @@ dhcp-authoritative dhcp-lease-max=3D253 dhcp-hostsfile=3D/var/lib/libvirt/dnsmasq/default.hostsfile addn-hosts=3D/var/lib/libvirt/dnsmasq/default.addnhosts +dhcp-range=3D2001:db8:ac10:fe01::1,ra-only +dhcp-range=3D2001:db8:ac10:fd01::1,ra-only diff --git a/tests/networkxml2confdata/nat-network-dns-txt-record.conf b/te= sts/networkxml2confdata/nat-network-dns-txt-record.conf index 735c261c01..d9b981a6e5 100644 --- a/tests/networkxml2confdata/nat-network-dns-txt-record.conf +++ b/tests/networkxml2confdata/nat-network-dns-txt-record.conf @@ -15,3 +15,5 @@ dhcp-authoritative dhcp-lease-max=3D253 dhcp-hostsfile=3D/var/lib/libvirt/dnsmasq/default.hostsfile addn-hosts=3D/var/lib/libvirt/dnsmasq/default.addnhosts +dhcp-range=3D2001:db8:ac10:fe01::1,ra-only +dhcp-range=3D2001:db8:ac10:fd01::1,ra-only diff --git a/tests/networkxml2confdata/nat-network-name-with-quotes.conf b/= tests/networkxml2confdata/nat-network-name-with-quotes.conf index 1b06de3066..5c5ea7b48e 100644 --- a/tests/networkxml2confdata/nat-network-name-with-quotes.conf +++ b/tests/networkxml2confdata/nat-network-name-with-quotes.conf @@ -6,12 +6,8 @@ ## dnsmasq conf file created by libvirt strict-order except-interface=3Dlo -bind-interfaces -listen-address=3D192.168.122.1 -listen-address=3D192.168.123.1 -listen-address=3Dfc00:db8:ac10:fe01::1 -listen-address=3Dfc00:db8:ac10:fd01::1 -listen-address=3D10.24.10.1 +bind-dynamic +interface=3Dvirbr0 srv-host=3D_name._tcp dhcp-range=3D192.168.122.2,192.168.122.254,255.255.255.0 dhcp-no-override @@ -19,3 +15,5 @@ dhcp-authoritative dhcp-lease-max=3D253 dhcp-hostsfile=3D/var/lib/libvirt/dnsmasq/default"with"quotes&qu= ot;.hostsfile addn-hosts=3D/var/lib/libvirt/dnsmasq/default"with"quotes".= addnhosts +dhcp-range=3Dfc00:db8:ac10:fe01::1,ra-only +dhcp-range=3Dfc00:db8:ac10:fd01::1,ra-only diff --git a/tests/networkxml2confdata/netboot-network.conf b/tests/network= xml2confdata/netboot-network.conf index 99272b9d68..a13239a54f 100644 --- a/tests/networkxml2confdata/netboot-network.conf +++ b/tests/networkxml2confdata/netboot-network.conf @@ -8,8 +8,8 @@ strict-order domain=3Dexample.com expand-hosts except-interface=3Dlo -bind-interfaces -listen-address=3D192.168.122.1 +bind-dynamic +interface=3Dvirbr1 dhcp-range=3D192.168.122.2,192.168.122.254,255.255.255.0 dhcp-no-override dhcp-authoritative diff --git a/tests/networkxml2confdata/netboot-proxy-network.conf b/tests/n= etworkxml2confdata/netboot-proxy-network.conf index fb0a20cff4..280da323e2 100644 --- a/tests/networkxml2confdata/netboot-proxy-network.conf +++ b/tests/networkxml2confdata/netboot-proxy-network.conf @@ -8,8 +8,8 @@ strict-order domain=3Dexample.com expand-hosts except-interface=3Dlo -bind-interfaces -listen-address=3D192.168.122.1 +bind-dynamic +interface=3Dvirbr1 dhcp-range=3D192.168.122.2,192.168.122.254,255.255.255.0 dhcp-no-override dhcp-authoritative diff --git a/tests/networkxml2conftest.c b/tests/networkxml2conftest.c index 7177505918..178c74d9af 100644 --- a/tests/networkxml2conftest.c +++ b/tests/networkxml2conftest.c @@ -112,12 +112,8 @@ static int mymain(void) { int ret =3D 0; - dnsmasqCaps *restricted - =3D dnsmasqCapsNewFromBuffer("Dnsmasq version 2.48"); dnsmasqCaps *full - =3D dnsmasqCapsNewFromBuffer("Dnsmasq version 2.63\n--bind-dynamic= "); - dnsmasqCaps *dhcpv6 - =3D dnsmasqCapsNewFromBuffer("Dnsmasq version 2.64\n--bind-dynamic= "); + =3D dnsmasqCapsNewFromBuffer("Dnsmasq version 2.67\n--bind-dynamic= \n--ra-param"); =20 #define DO_TEST(xname, xcaps) \ do { \ @@ -131,15 +127,15 @@ mymain(void) } \ } while (0) =20 - DO_TEST("isolated-network", restricted); - DO_TEST("netboot-network", restricted); - DO_TEST("netboot-proxy-network", restricted); - DO_TEST("nat-network-dns-srv-record-minimal", restricted); - DO_TEST("nat-network-name-with-quotes", restricted); + DO_TEST("isolated-network", full); + DO_TEST("netboot-network", full); + DO_TEST("netboot-proxy-network", full); + DO_TEST("nat-network-dns-srv-record-minimal", full); + DO_TEST("nat-network-name-with-quotes", full); DO_TEST("routed-network", full); DO_TEST("routed-network-no-dns", full); DO_TEST("open-network", full); - DO_TEST("nat-network", dhcpv6); + DO_TEST("nat-network", full); DO_TEST("nat-network-dns-txt-record", full); DO_TEST("nat-network-dns-srv-record", full); DO_TEST("nat-network-dns-hosts", full); @@ -147,20 +143,18 @@ mymain(void) DO_TEST("nat-network-dns-forwarders", full); DO_TEST("nat-network-dns-forwarder-no-resolv", full); DO_TEST("nat-network-dns-local-domain", full); - DO_TEST("nat-network-mtu", dhcpv6); - DO_TEST("dhcp6-network", dhcpv6); - DO_TEST("dhcp6-nat-network", dhcpv6); - DO_TEST("dhcp6host-routed-network", dhcpv6); - DO_TEST("ptr-domains-auto", dhcpv6); - DO_TEST("dnsmasq-options", dhcpv6); + DO_TEST("nat-network-mtu", full); + DO_TEST("dhcp6-network", full); + DO_TEST("dhcp6-nat-network", full); + DO_TEST("dhcp6host-routed-network", full); + DO_TEST("ptr-domains-auto", full); + DO_TEST("dnsmasq-options", full); DO_TEST("leasetime-seconds", full); DO_TEST("leasetime-minutes", full); DO_TEST("leasetime-hours", full); DO_TEST("leasetime-infinite", full); =20 - virObjectUnref(dhcpv6); virObjectUnref(full); - virObjectUnref(restricted); =20 return ret =3D=3D 0 ? EXIT_SUCCESS : EXIT_FAILURE; } --=20 2.31.1 From nobody Sun May 5 23:27:13 2024 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=1639509009; cv=none; d=zohomail.com; s=zohoarc; b=Mtxi5xySO46v7YRUaLJgYoHOGWF2z85HU3sisTWQd5QAYF/LRQmdBQBJMc6vf1E7L4khCNyqTbstdElD9nIXMZQNQFXju9UjYBj6KQ3J7DkzqkbtPRAXnYIfGT1zyICTAf+QNUCzKIQJxGX+Nh7ZjRyjOpn72PQ+sD1iAeszO+Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1639509009; 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=49oRmMPChshBqQswYNgy4SLud9cmL4mh3wZkJD5GoMA=; b=K++4E4ZU3IZhx4vz3zTylcJoRFBzrYLiyB1wrRUK5zcorhhPzXIRKLh0F81GXdQhh8nqlnV85KhOG+1Xi9PG3LcbsNWOrtFOEmO52UIcpKay2xYgU2qYI/JegGMma38DqdJK/xiYjvFcWf9JSZxC6sjiqumy8VWjsUZNxYryOg4= 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 1639509009290831.2435327598577; Tue, 14 Dec 2021 11:10:09 -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-21-HURwNhDcNW6RdrvbejZ5bA-1; Tue, 14 Dec 2021 14:10:06 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 10A1510168C6; Tue, 14 Dec 2021 19:10: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 E1D0634B4B; Tue, 14 Dec 2021 19:09:59 +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 9ECD11806D2B; Tue, 14 Dec 2021 19:09:59 +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 1BEJ9srn000817 for ; Tue, 14 Dec 2021 14:09:54 -0500 Received: by smtp.corp.redhat.com (Postfix) id 46EAE18A4E; Tue, 14 Dec 2021 19:09:54 +0000 (UTC) Received: from hjs.redhat.com (unknown [10.43.2.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id C1F81610A7 for ; Tue, 14 Dec 2021 19:09:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1639509008; 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=49oRmMPChshBqQswYNgy4SLud9cmL4mh3wZkJD5GoMA=; b=IkJN27QIYle3jFYBHjw5pwnf/LXSPUN+IMdI/XranVPuS+xM8iyZgG/4SpsqbkU4EVCveu hfpD4GOICx7rXj8puvxfQRqpAdrbiumMswFWOcygXd5DoC9JmzLQP9/sgiD/s8xMiuJQ0Z Z54hsN6X9kgFl2E3YmATN2hrFJl6irk= X-MC-Unique: HURwNhDcNW6RdrvbejZ5bA-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 03/17] util: dnsmasq: mandate at least version 2.67 Date: Tue, 14 Dec 2021 20:09:19 +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.23 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: 1639509011070100001 All the capabilities should be supported in 2.67. Make this the minimum version, since even the oldest distros we support have moved on: Debian 8: 2.72 CentOS 7: 2.76 Ubuntu 18.04: 2.79 Signed-off-by: J=C3=A1n Tomko Reviewed-by: Laine Stump --- src/util/virdnsmasq.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/util/virdnsmasq.c b/src/util/virdnsmasq.c index 90a1ea35b6..efe65174f8 100644 --- a/src/util/virdnsmasq.c +++ b/src/util/virdnsmasq.c @@ -49,6 +49,9 @@ VIR_LOG_INIT("util.dnsmasq"); #define DNSMASQ_HOSTSFILE_SUFFIX "hostsfile" #define DNSMASQ_ADDNHOSTSFILE_SUFFIX "addnhosts" =20 +#define DNSMASQ_MIN_MAJOR 2 +#define DNSMASQ_MIN_MINOR 67 + static void dhcphostFreeContent(dnsmasqDhcpHost *host) { @@ -627,6 +630,16 @@ dnsmasqCapsSetFromBuffer(dnsmasqCaps *caps, const char= *buf) if (virParseVersionString(p, &caps->version, true) < 0) goto error; =20 + if (caps->version / 1000000 < DNSMASQ_MIN_MAJOR || + caps->version % 1000000 < DNSMASQ_MIN_MINOR) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("dnsmasq version >=3D %u.%u required but %lu.%lu = found"), + DNSMASQ_MIN_MAJOR, DNSMASQ_MIN_MINOR, + caps->version / 1000000, + caps->version % 1000000); + goto error; + } + if (strstr(buf, "--bind-dynamic")) dnsmasqCapsSet(caps, DNSMASQ_CAPS_BIND_DYNAMIC); =20 --=20 2.31.1 From nobody Sun May 5 23:27:13 2024 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=1639509018; cv=none; d=zohomail.com; s=zohoarc; b=SvHL1SRXxWat0CRXlixFjLYda6fts1emM3lqeBqpTg1CqLE4zQMpS78OdFLYs/sQNK7SZ3AK5BptrqQGJMaKHKP/taxHIo1CVl/C0aUkovz2eSpIgp+NONx7IG69JXyo9GHygmDBe0gRt6yBgaRjRhDzpptyTJDIm3iRd5ADvPs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1639509018; 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=A8ifHtI6LxBdtjDcuDKOKPomWXdeiTZmOofS9/68Tvg=; b=QBSWEwEKf980f31FmLk+SsD/cZUFj3TBZDLM07fFi1YI5y3MylPzqINZ5PDYwLc88QK5f8U5sYIRApc0nsjhL3vFTNO2r8FKrTw80H4ZPeyJLThSEaikVThFyJS564eO52NcKb2wk3tNKzAuytKv7a/eylqnjtP2S6vzK4Vf7DE= 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 1639509018791345.6341364789308; Tue, 14 Dec 2021 11:10:18 -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-397-Niw14EvdOUuxpi0HSu6pHQ-1; Tue, 14 Dec 2021 14:10:14 -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 7041581EE72; Tue, 14 Dec 2021 19:10:08 +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 4B6105BE02; Tue, 14 Dec 2021 19:10:08 +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 175AA1805302; Tue, 14 Dec 2021 19:10:08 +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 1BEJ9tKV000825 for ; Tue, 14 Dec 2021 14:09:55 -0500 Received: by smtp.corp.redhat.com (Postfix) id 1A1BE369A; Tue, 14 Dec 2021 19:09:55 +0000 (UTC) Received: from hjs.redhat.com (unknown [10.43.2.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 95274610A7 for ; Tue, 14 Dec 2021 19:09:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1639509017; 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=A8ifHtI6LxBdtjDcuDKOKPomWXdeiTZmOofS9/68Tvg=; b=CxDtEuKcOKW/nBa4Hq7R8roOwhy/wHi5DSPWxrh8Ot6gM+cKW+Of48fe0FEo9f8qpKQxSF LGUrbhbQ0gf0gtNKMcp3HSmgHSNKFtjNtuGLcDMQtdnY+SkZMD8Fg+Sf842ZHmxaQkpd6Y YqmOTjAP+IG3JnNRFckwIstC/XapnKA= X-MC-Unique: Niw14EvdOUuxpi0HSu6pHQ-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 04/17] network: assume DNSMASQ_DHCPv6_SUPPORT Date: Tue, 14 Dec 2021 20:09:20 +0100 Message-Id: <0416c3ac71dbf0a89873a52aebf2bca75e5e88f4.1639508754.git.jtomko@redhat.com> 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.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-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1639509019898100001 Remove the (now unreachable) error message and the macro. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Laine Stump --- src/network/bridge_driver.c | 14 -------------- src/util/virdnsmasq.h | 6 ------ 2 files changed, 20 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 40dccf2c15..526485e3f9 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -1329,20 +1329,6 @@ networkDnsmasqConfContents(virNetworkObj *obj, } if (VIR_SOCKET_ADDR_IS_FAMILY(&ipdef->address, AF_INET6)) { if (ipdef->nranges || ipdef->nhosts) { - if (!DNSMASQ_DHCPv6_SUPPORT(caps)) { - unsigned long version =3D dnsmasqCapsGetVersion(caps); - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("The version of dnsmasq on this host " - "(%d.%d) doesn't adequately support " - "IPv6 dhcp range or dhcp host " - "specification. Version %d.%d or late= r " - "is required."), - (int)version / 1000000, - (int)(version % 1000000) / 1000, - DNSMASQ_DHCPv6_MAJOR_REQD, - DNSMASQ_DHCPv6_MINOR_REQD); - return -1; - } if (ipv6def) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("For IPv6, multiple DHCP definitions " diff --git a/src/util/virdnsmasq.h b/src/util/virdnsmasq.h index ee9839cd25..92c5d4129d 100644 --- a/src/util/virdnsmasq.h +++ b/src/util/virdnsmasq.h @@ -107,15 +107,9 @@ unsigned long dnsmasqCapsGetVersion(dnsmasqCaps *caps); char *dnsmasqDhcpHostsToString(dnsmasqDhcpHost *hosts, unsigned int nhosts); =20 -#define DNSMASQ_DHCPv6_MAJOR_REQD 2 -#define DNSMASQ_DHCPv6_MINOR_REQD 64 #define DNSMASQ_RA_MAJOR_REQD 2 #define DNSMASQ_RA_MINOR_REQD 64 =20 -#define DNSMASQ_DHCPv6_SUPPORT(CAPS) \ - (dnsmasqCapsGetVersion(CAPS) >=3D \ - (DNSMASQ_DHCPv6_MAJOR_REQD * 1000000) + \ - (DNSMASQ_DHCPv6_MINOR_REQD * 1000)) #define DNSMASQ_RA_SUPPORT(CAPS) \ (dnsmasqCapsGetVersion(CAPS) >=3D \ (DNSMASQ_RA_MAJOR_REQD * 1000000) + \ --=20 2.31.1 From nobody Sun May 5 23:27:13 2024 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=1639509047; cv=none; d=zohomail.com; s=zohoarc; b=MlcmZiqvBCBbgqHeOGEdQuZvYCUy8/HU39ZbQqknhA1ay81czTY4jJ2vLuQOTwop1s5TrvzbHfouSMfXxxHImNXM5MRZwJbkYNkxrnzZ7xwLK4HIu4myMVuGROVyX7x3qO4mLpHNmbarK/9FVOYzA9wvNxSjMgStOvX5SOdZhOU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1639509047; 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=SQ5/VDZXERXewWkDsXUFuy897P1eY+6LeeHarjdWxVk=; b=YeTuiLQDZ0rP4KNYgQX3PYt3bGlKPt1CJGEp9+Eye4mg+MgRhCPus23OywVga0IyqwrJndhHlbYF0mJa8ewm0x7xFuVQDFKoTIWSbASliXooy0nbKAAxUVm3s6/YCnONYGvyThVTQuP3nCjE9u5fYOpHEtuJ1mHVDT7Ab5zvs0M= 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 1639509047499330.2642374960071; Tue, 14 Dec 2021 11:10:47 -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-433-fRqDDIj_OJGtWCrb2IjumA-1; Tue, 14 Dec 2021 14:10:42 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id CEF143E741; Tue, 14 Dec 2021 19:10:36 +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 928965E275; Tue, 14 Dec 2021 19:10:36 +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 441F518033F6; Tue, 14 Dec 2021 19:10:36 +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 1BEJAZ9x001171 for ; Tue, 14 Dec 2021 14:10:35 -0500 Received: by smtp.corp.redhat.com (Postfix) id 0E18960CC9; Tue, 14 Dec 2021 19:10:35 +0000 (UTC) Received: from hjs.redhat.com (unknown [10.43.2.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8926461095 for ; Tue, 14 Dec 2021 19:09:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1639509046; 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=SQ5/VDZXERXewWkDsXUFuy897P1eY+6LeeHarjdWxVk=; b=gl4g6oL9gpsfq2u17IWSk6PipKRAxcl+msogfGAbeRZ67JRXNeMhokrtFhr9Po7qnF+S20 wn38sG+W64OH2NDlxGhWyJ69Q+jF2m5m8BPw69uda7UponJfdl09lIRNMHaezWq59K0z9F HrO4oHXhbZQNXFeNXzmYrDJI4ANXS8w= X-MC-Unique: fRqDDIj_OJGtWCrb2IjumA-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 05/17] network: assume DNSMASQ_RA_SUPPORT Date: Tue, 14 Dec 2021 20:09:21 +0100 Message-Id: <8ff47bc3fa97f5ad7e60382c3633cb76888f6e48.1639508754.git.jtomko@redhat.com> 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.79 on 10.5.11.14 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: 1639509048762100001 Delete the code that is only run without the capability. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Laine Stump --- src/network/bridge_driver.c | 134 +++++------------------------------- 1 file changed, 19 insertions(+), 115 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 526485e3f9..e57731742b 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -1486,21 +1486,18 @@ networkDnsmasqConfContents(virNetworkObj *obj, if (def->mtu > 0) virBufferAsprintf(&configbuf, "dhcp-option=3Doption:mtu,%d\n", def= ->mtu); =20 - /* Are we doing RA instead of radvd? */ - if (DNSMASQ_RA_SUPPORT(caps)) { - if (ipv6def) { - virBufferAddLit(&configbuf, "enable-ra\n"); - } else { - for (i =3D 0; - (ipdef =3D virNetworkDefGetIPByIndex(def, AF_INET6, i)); - i++) { - if (!(ipdef->nranges || ipdef->nhosts)) { - g_autofree char *bridgeaddr =3D virSocketAddrFormat(&i= pdef->address); - if (!bridgeaddr) - return -1; - virBufferAsprintf(&configbuf, - "dhcp-range=3D%s,ra-only\n", bridgea= ddr); - } + if (ipv6def) { + virBufferAddLit(&configbuf, "enable-ra\n"); + } else { + for (i =3D 0; + (ipdef =3D virNetworkDefGetIPByIndex(def, AF_INET6, i)); + i++) { + if (!(ipdef->nranges || ipdef->nhosts)) { + g_autofree char *bridgeaddr =3D virSocketAddrFormat(&ipdef= ->address); + if (!bridgeaddr) + return -1; + virBufferAsprintf(&configbuf, + "dhcp-range=3D%s,ra-only\n", bridgeaddr); } } } @@ -1860,84 +1857,11 @@ networkRadvdConfWrite(virNetworkDriverState *driver, =20 =20 static int -networkStartRadvd(virNetworkDriverState *driver, +networkStartRadvd(virNetworkDriverState *driver G_GNUC_UNUSED, virNetworkObj *obj) { - virNetworkDef *def =3D virNetworkObjGetDef(obj); - g_autoptr(dnsmasqCaps) dnsmasq_caps =3D networkGetDnsmasqCaps(driver); - pid_t radvdPid; - g_autofree char *pidfile =3D NULL; - g_autofree char *radvdpidbase =3D NULL; - g_autofree char *configfile =3D NULL; - g_autoptr(virCommand) cmd =3D NULL; - virNetworkObjSetRadvdPid(obj, -1); =20 - /* Is dnsmasq handling RA? */ - if (DNSMASQ_RA_SUPPORT(dnsmasq_caps)) - return 0; - - if (!virNetworkDefGetIPByIndex(def, AF_INET6, 0)) { - /* no IPv6 addresses, so we don't need to run radvd */ - return 0; - } - - if (!virFileIsExecutable(RADVD)) { - virReportSystemError(errno, - _("Cannot find %s - " - "Possibly the package isn't installed"), - RADVD); - return -1; - } - - if (g_mkdir_with_parents(driver->pidDir, 0777) < 0) { - virReportSystemError(errno, - _("cannot create directory %s"), - driver->pidDir); - return -1; - } - - if (g_mkdir_with_parents(driver->radvdStateDir, 0777) < 0) { - virReportSystemError(errno, - _("cannot create directory %s"), - driver->radvdStateDir); - return -1; - } - - /* construct pidfile name */ - if (!(radvdpidbase =3D networkRadvdPidfileBasename(def->name))) - return -1; - - if (!(pidfile =3D virPidFileBuildPath(driver->pidDir, radvdpidbase))) - return -1; - - if (networkRadvdConfWrite(driver, obj, &configfile) < 0) - return -1; - - /* prevent radvd from daemonizing itself with "--debug 1", and use - * a dummy pidfile name - virCommand will create the pidfile we - * want to use (this is necessary because radvd's internal - * daemonization and pidfile creation causes a race, and the - * virPidFileRead() below will fail if we use them). - * Unfortunately, it isn't possible to tell radvd to not create - * its own pidfile, so we just let it do so, with a slightly - * different name. Unused, but harmless. - */ - cmd =3D virCommandNewArgList(RADVD, "--debug", "1", - "--config", configfile, - "--pidfile", NULL); - virCommandAddArgFormat(cmd, "%s-bin", pidfile); - - virCommandSetPidFile(cmd, pidfile); - virCommandDaemonize(cmd); - - if (virCommandRun(cmd, NULL) < 0) - return -1; - - if (virPidFileRead(driver->pidDir, radvdpidbase, &radvdPid) < 0) - return -1; - - virNetworkObjSetRadvdPid(obj, radvdPid); return 0; } =20 @@ -1947,36 +1871,16 @@ networkRefreshRadvd(virNetworkDriverState *driver, virNetworkObj *obj) { virNetworkDef *def =3D virNetworkObjGetDef(obj); - g_autoptr(dnsmasqCaps) dnsmasq_caps =3D networkGetDnsmasqCaps(driver); g_autofree char *radvdpidbase =3D NULL; g_autofree char *pidfile =3D NULL; - pid_t radvdPid; =20 - /* Is dnsmasq handling RA? */ - if (DNSMASQ_RA_SUPPORT(dnsmasq_caps)) { - if ((radvdpidbase =3D networkRadvdPidfileBasename(def->name)) && - (pidfile =3D virPidFileBuildPath(driver->pidDir, radvdpidbase)= )) { - /* radvd should not be running but in case it is */ - virPidFileForceCleanupPath(pidfile); - virNetworkObjSetRadvdPid(obj, -1); - } - return 0; + if ((radvdpidbase =3D networkRadvdPidfileBasename(def->name)) && + (pidfile =3D virPidFileBuildPath(driver->pidDir, radvdpidbase))) { + /* radvd should not be running but in case it is */ + virPidFileForceCleanupPath(pidfile); + virNetworkObjSetRadvdPid(obj, -1); } - - /* if there's no running radvd, just start it */ - radvdPid =3D virNetworkObjGetRadvdPid(obj); - if (radvdPid <=3D 0 || (kill(radvdPid, 0) < 0)) - return networkStartRadvd(driver, obj); - - if (!virNetworkDefGetIPByIndex(def, AF_INET6, 0)) { - /* no IPv6 addresses, so we don't need to run radvd */ - return 0; - } - - if (networkRadvdConfWrite(driver, obj, NULL) < 0) - return -1; - - return kill(radvdPid, SIGHUP); + return 0; } =20 =20 --=20 2.31.1 From nobody Sun May 5 23:27:13 2024 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=1639509051; cv=none; d=zohomail.com; s=zohoarc; b=bwRsG9AYiikHn9/basUp1t+zD8hGwm/dQK+hwPoIVSjdKn1bEBC1nG0LaoMYr+aeqlJlOmH7yrvQ2LeKRpCWHVIKLAaJM3usnUJnBzhEu00C2gRrrQ2tR3zlqkas7ik5YiLfq54d0KOtAu3XiVEaNpCzwxFs8YNi0OhdPKhAhPo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1639509051; 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=32zF1JVkYzK0BoShy9HZzB98DuEDxa0juZ96LWEtMBE=; b=AeZhBMTZ9EAsNXmhyLLKYoum5ayxLBtmDaw6JlTKew8Mu4vOVinDF1zzDQc8N8Gl5nxzziB+ZY0f9eFDvdTmjRNVerObyWMkgs9bWlFsE8koCIae7o8NTYLXEuMjSSv7lnVkpLlAF7mxSaAnkqjImweFDqzb6X7lH/4kO9btbI0= 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 1639509051911451.23690226291706; Tue, 14 Dec 2021 11:10:51 -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-391-TPYUqjI0M_arDS2LyL3dfw-1; Tue, 14 Dec 2021 14:10:49 -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 5C92D192FDA2; Tue, 14 Dec 2021 19:10:42 +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 3E8AF10AD785; Tue, 14 Dec 2021 19:10:42 +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 0F96F4A7C8; Tue, 14 Dec 2021 19:10:42 +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 1BEJAeKM001186 for ; Tue, 14 Dec 2021 14:10:40 -0500 Received: by smtp.corp.redhat.com (Postfix) id B7DAB60CC9; Tue, 14 Dec 2021 19:10:40 +0000 (UTC) Received: from hjs.redhat.com (unknown [10.43.2.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3E904610AE for ; Tue, 14 Dec 2021 19:10:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1639509050; 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=32zF1JVkYzK0BoShy9HZzB98DuEDxa0juZ96LWEtMBE=; b=dlrQCN3+jUAstzjhcGG+vBXmVr5vq7dFoEqQSdzEToLQ50pcxQbQVjL7lOhWy4wWwuL7yY y0fXfDIhXQTHvB5Zkfx++KWCEVfWRpPgIVvy0NM6xN834ugqxDnXI+a5HIRTncG1Fb3alJ wFGu+pUj3kGTeb/R/pnTyE+2ZINwtxg= X-MC-Unique: TPYUqjI0M_arDS2LyL3dfw-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 06/17] util: remove DNSMASQ_RA_SUPPORT Date: Tue, 14 Dec 2021 20:09:22 +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: 1639509053736100001 Now that the macro is unused, delete it. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Laine Stump --- src/util/virdnsmasq.h | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/util/virdnsmasq.h b/src/util/virdnsmasq.h index 92c5d4129d..9b8aeef226 100644 --- a/src/util/virdnsmasq.h +++ b/src/util/virdnsmasq.h @@ -106,11 +106,3 @@ const char *dnsmasqCapsGetBinaryPath(dnsmasqCaps *caps= ); unsigned long dnsmasqCapsGetVersion(dnsmasqCaps *caps); char *dnsmasqDhcpHostsToString(dnsmasqDhcpHost *hosts, unsigned int nhosts); - -#define DNSMASQ_RA_MAJOR_REQD 2 -#define DNSMASQ_RA_MINOR_REQD 64 - -#define DNSMASQ_RA_SUPPORT(CAPS) \ - (dnsmasqCapsGetVersion(CAPS) >=3D \ - (DNSMASQ_RA_MAJOR_REQD * 1000000) + \ - (DNSMASQ_RA_MINOR_REQD * 1000)) --=20 2.31.1 From nobody Sun May 5 23:27:13 2024 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=he5by6XG6YONdVhBaXTWHOWM9PsFyRng2tg7z7LEwDAZ/XpZaY2DwIQUo5E62jlcsAEfG3cJujdza8zcrR1SWE40nNub8EBgGHHessBrL/qkuWOI9KgYjXjSaAS9dXP3vcS/Ntd5ufotBhciBkAl4NrCSDL5okiCFarQ0BWI1E4= 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=GwzwBKYGTk1Q8FfYypFEFe+0QvCiskvvzIvmqdGxuE8=; b=cmaVTCidn5nWztcTMNxvfohIbMr+sH+vkCwvqH4ItQv+2DJTzqv5rgNRmBnB5vrrZTHhRQt2GmgWQCH4zV4hXDY+9COk3zvbXSU71yQXMEHUuhteeXqvkpN+qhOXVX1SDDnuXRIpVmCHfqeXzKcNoRsKygb3KF0PZ/afypHncRE= 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 1639509057539563.523771058164; 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-168-dtU2yOjyM8SglK1V1z5Iyw-1; Tue, 14 Dec 2021 14:10:52 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 04DC9192FDA6; Tue, 14 Dec 2021 19:10:48 +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 D80C27A220; Tue, 14 Dec 2021 19:10:47 +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 A56EA4A7C9; Tue, 14 Dec 2021 19:10:47 +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 1BEJAkGS001207 for ; Tue, 14 Dec 2021 14:10:46 -0500 Received: by smtp.corp.redhat.com (Postfix) id 8910C610AE; Tue, 14 Dec 2021 19:10:46 +0000 (UTC) Received: from hjs.redhat.com (unknown [10.43.2.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0FCEC610A7 for ; Tue, 14 Dec 2021 19:10:40 +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=GwzwBKYGTk1Q8FfYypFEFe+0QvCiskvvzIvmqdGxuE8=; b=XkKTaxUu1NJ1tSm6FI7CQWtWJ3fGasE1I/J07nCI+m60fZYZHe6CK0A5Ezrv7HPWVLAKhi f63hOD5nTyWYNDZfEciGcV4FuQ0YXhb3ieqnuCnwMvH5UjKKIoK35zW7wPhOKk9MW/qWi2 FH2dYrfIRdCRRcqEuoRpGZJ6GTK37aI= X-MC-Unique: dtU2yOjyM8SglK1V1z5Iyw-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 07/17] network: assume DNSMASQ_CAPS_BIND_DYNAMIC Date: Tue, 14 Dec 2021 20:09:23 +0100 Message-Id: <17292dadbb52b4182d766cde9dea0eb56fbe3a34.1639508754.git.jtomko@redhat.com> 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.79 on 10.5.11.16 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: 1639509059044100002 Introduced by dnsmasq commit: commit 54dd393f3938fc0c19088fbd319b95e37d81a2b0 CommitDate: 2012-06-20 11:23:38 +0100 Add --bind-dynamic git describe: v2.63test1 contains: v2.63test1^0 Signed-off-by: J=C3=A1n Tomko Reviewed-by: Laine Stump --- src/network/bridge_driver.c | 68 ++++++------------------------------- 1 file changed, 11 insertions(+), 57 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index e57731742b..dffe4e1574 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -1062,7 +1062,6 @@ networkDnsmasqConfContents(virNetworkObj *obj, size_t i; virNetworkDNSDef *dns =3D &def->dns; bool wantDNS =3D dns->enable !=3D VIR_TRISTATE_BOOL_NO; - virNetworkIPDef *tmpipdef; virNetworkIPDef *ipdef; virNetworkIPDef *ipv4def; virNetworkIPDef *ipv6def; @@ -1173,62 +1172,17 @@ networkDnsmasqConfContents(virNetworkObj *obj, virBufferAddLit(&configbuf, "except-interface=3Dlo0\n"); #endif =20 - if (dnsmasqCapsGet(caps, DNSMASQ_CAPS_BIND_DYNAMIC)) { - /* using --bind-dynamic with only --interface (no - * --listen-address) prevents dnsmasq from responding to dns - * queries that arrive on some interface other than our bridge - * interface (in other words, requests originating somewhere - * other than one of the virtual guests connected directly to - * this network). This was added in response to CVE 2012-3411. - */ - virBufferAsprintf(&configbuf, - "bind-dynamic\n" - "interface=3D%s\n", - def->bridge); - } else { - virBufferAddLit(&configbuf, "bind-interfaces\n"); - /* - * --interface does not actually work with dnsmasq < 2.47, - * due to DAD for ipv6 addresses on the interface. - * - * virCommandAddArgList(cmd, "--interface", def->bridge, NULL); - * - * So listen on all defined IPv[46] addresses - */ - for (i =3D 0; - (tmpipdef =3D virNetworkDefGetIPByIndex(def, AF_UNSPEC, i)); - i++) { - g_autofree char *ipaddr =3D virSocketAddrFormat(&tmpipdef->add= ress); - - if (!ipaddr) - return -1; - - /* also part of CVE 2012-3411 - if the host's version of - * dnsmasq doesn't have bind-dynamic, only allow listening on - * private/local IP addresses (see RFC1918/RFC3484/RFC4193) - */ - if (!dnsmasqCapsGet(caps, DNSMASQ_CAPS_BINDTODEVICE) && - !virSocketAddrIsPrivate(&tmpipdef->address)) { - unsigned long version =3D dnsmasqCapsGetVersion(caps); - - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Publicly routable address %s is prohibit= ed. " - "The version of dnsmasq on this host (%d.= %d) " - "doesn't support the bind-dynamic option = or " - "use SO_BINDTODEVICE on listening sockets= , " - "one of which is required for safe operat= ion " - "on a publicly routable subnet " - "(see CVE-2012-3411). You must either " - "upgrade dnsmasq, or use a private/local " - "subnet range for this network " - "(as described in RFC1918/RFC3484/RFC4193= )."), - ipaddr, (int)version / 1000000, - (int)(version % 1000000) / 1000); - return -1; - } - virBufferAsprintf(&configbuf, "listen-address=3D%s\n", ipaddr); - } - } + /* using --bind-dynamic with only --interface (no + * --listen-address) prevents dnsmasq from responding to dns + * queries that arrive on some interface other than our bridge + * interface (in other words, requests originating somewhere + * other than one of the virtual guests connected directly to + * this network). This was added in response to CVE 2012-3411. + */ + virBufferAsprintf(&configbuf, + "bind-dynamic\n" + "interface=3D%s\n", + def->bridge); =20 /* If this is an isolated network, set the default route option * (3) to be empty to avoid setting a default route that's --=20 2.31.1 From nobody Sun May 5 23:27:13 2024 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 Reviewed-by: Laine Stump --- 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 From nobody Sun May 5 23:27:13 2024 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=1639509062; cv=none; d=zohomail.com; s=zohoarc; b=R2+pK5V5F3VPFFkfbo5z8+WoSL+LjJYCJvhDNK1luq/8/XYinSGnRIzx8a2uE8GZ1l0hvScEVthHci3okGjG7tB9i5DjpE+dOl0mxMNm0Gm1FJPDHjZANEn/mPIw8bFp7w7zNi7ZWXVtr3RjbhZ7ONKYVGZKh9MAE8pYWuxzZbU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1639509062; 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=wycHjyrWVMpAWs5VdS8tWeJBfuAb6JJec6zgWNsBNnY=; b=N1kAQLeK/7D3IjJGQVjMURozVaOkP8sQhrG6W45Dpe3nf/gxcW75JkYex9soBsHY0Q1l6VKZkbpdg5HauLEAMIiOmg8qjfrUwAnz70o0DrG+D8ud2jwIg7sdGvygN/0+YNSfj54Moy29tZdRu9S2rV+3ISu251N0Fz6gbSwEThs= 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 1639509062603839.548796356914; Tue, 14 Dec 2021 11:11:02 -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-244-wlTUlerLN6GuG2yZbseRMg-1; Tue, 14 Dec 2021 14:10:58 -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 66D98802E68; Tue, 14 Dec 2021 19:10: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 08D1710AD788; Tue, 14 Dec 2021 19:10: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 C43554A7CA; Tue, 14 Dec 2021 19:10:50 +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 1BEJAmkO001224 for ; Tue, 14 Dec 2021 14:10:48 -0500 Received: by smtp.corp.redhat.com (Postfix) id 2F6CE610AE; Tue, 14 Dec 2021 19:10:48 +0000 (UTC) Received: from hjs.redhat.com (unknown [10.43.2.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id A9C11610A7 for ; Tue, 14 Dec 2021 19:10:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1639509061; 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=wycHjyrWVMpAWs5VdS8tWeJBfuAb6JJec6zgWNsBNnY=; b=INckOybo5He7vtRDgTPZt7thFzkJQtWyhSNNCSM/HuWdji+b3g1+84PKH3IU9LGGlm12FF ieeDLu6FNwosC4ZrlBSsaQ0YvPpjMHCzjWSQRt0SRmKcFxpMboJAZ/n9QAYvjJGKKcGJSv mrxgakX+Qw73io26mBDnfkOP/hTqa64= X-MC-Unique: wlTUlerLN6GuG2yZbseRMg-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 09/17] util: dnsmasq: delete assumed capability flags Date: Tue, 14 Dec 2021 20:09:25 +0100 Message-Id: <3afa1b61b1a7be992a6ddd50051a4f7498c43577.1639508754.git.jtomko@redhat.com> 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: 1639509063215100001 Signed-off-by: J=C3=A1n Tomko Reviewed-by: Laine Stump --- src/util/virdnsmasq.c | 22 ++-------------------- src/util/virdnsmasq.h | 4 ---- 2 files changed, 2 insertions(+), 24 deletions(-) diff --git a/src/util/virdnsmasq.c b/src/util/virdnsmasq.c index efe65174f8..016d9d64a8 100644 --- a/src/util/virdnsmasq.c +++ b/src/util/virdnsmasq.c @@ -640,27 +640,9 @@ dnsmasqCapsSetFromBuffer(dnsmasqCaps *caps, const char= *buf) goto error; } =20 - if (strstr(buf, "--bind-dynamic")) - dnsmasqCapsSet(caps, DNSMASQ_CAPS_BIND_DYNAMIC); - - /* if this string is a part of the --version output, dnsmasq - * has been patched to use SO_BINDTODEVICE when listening, - * so that it will only accept requests that arrived on the - * listening interface(s) - */ - if (strstr(buf, "--bind-interfaces with SO_BINDTODEVICE")) - dnsmasqCapsSet(caps, DNSMASQ_CAPS_BINDTODEVICE); - - if (strstr(buf, "--ra-param")) - dnsmasqCapsSet(caps, DNSMASQ_CAPS_RA_PARAM); - - VIR_INFO("dnsmasq version is %d.%d, --bind-dynamic is %spresent, " - "SO_BINDTODEVICE is %sin use, --ra-param is %spresent", + VIR_INFO("dnsmasq version is %d.%d", (int)caps->version / 1000000, - (int)(caps->version % 1000000) / 1000, - dnsmasqCapsGet(caps, DNSMASQ_CAPS_BIND_DYNAMIC) ? "" : "NOT ", - dnsmasqCapsGet(caps, DNSMASQ_CAPS_BINDTODEVICE) ? "" : "NOT ", - dnsmasqCapsGet(caps, DNSMASQ_CAPS_RA_PARAM) ? "" : "NOT "); + (int)(caps->version % 1000000) / 1000); return 0; =20 error: diff --git a/src/util/virdnsmasq.h b/src/util/virdnsmasq.h index 9b8aeef226..9aa45c3046 100644 --- a/src/util/virdnsmasq.h +++ b/src/util/virdnsmasq.h @@ -68,10 +68,6 @@ typedef struct } dnsmasqContext; =20 typedef enum { - DNSMASQ_CAPS_BIND_DYNAMIC =3D 0, /* support for --bind-dynamic */ - DNSMASQ_CAPS_BINDTODEVICE =3D 1, /* uses SO_BINDTODEVICE for --bind-int= erfaces */ - DNSMASQ_CAPS_RA_PARAM =3D 2, /* support for --ra-param */ - DNSMASQ_CAPS_LAST, /* this must always be the last item */ } dnsmasqCapsFlags; =20 --=20 2.31.1 From nobody Sun May 5 23:27:13 2024 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=1639509066; cv=none; d=zohomail.com; s=zohoarc; b=CtNfk7w1MEG/yx4jYt4keymCckvps8a3RlodqBVE5T/CeOc3aIygPFDOUpiU9OVp0mGatYlxGip9Riu8thPOCPcgbL9KIWC3RygEgblFVb2HURhvy9fLcd8AfRLDtXkeshlQK49AgK2TVbgBm2ZZL8fCMFMr8Uo3AmwhLRqjgaU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1639509066; 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=7Yzytfhcd/oOQZLTX4yuZjioh+L+rCXN5dcekrxzDVc=; b=fApHKDf3nEZAWDHSB6rIXBzXB289Wgb6lmohxb4q3NiOiWBhjnz+niVga23O3NzixrlDwoxPrhIMh8tTJzmZyUMfEME3t4LvOtvx0i0TzOGMP6XsM9gzQlHpDqtCvv+x3H9s94iCQ1VP3pmc4JRXEPUOxNb4vB74Y4UrmjLp51k= 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 1639509066272279.76285530311156; Tue, 14 Dec 2021 11:11:06 -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-530-HYEORWo-MeyIGJHgEXcq1w-1; Tue, 14 Dec 2021 14:11:03 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id BB202192FDCE; Tue, 14 Dec 2021 19:10:54 +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 96883610A7; Tue, 14 Dec 2021 19:10:54 +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 654074A700; Tue, 14 Dec 2021 19:10:54 +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 1BEJAnvi001234 for ; Tue, 14 Dec 2021 14:10:49 -0500 Received: by smtp.corp.redhat.com (Postfix) id 03B98610AE; Tue, 14 Dec 2021 19:10:49 +0000 (UTC) Received: from hjs.redhat.com (unknown [10.43.2.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7E4E0610A7 for ; Tue, 14 Dec 2021 19:10:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1639509065; 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=7Yzytfhcd/oOQZLTX4yuZjioh+L+rCXN5dcekrxzDVc=; b=LQ8ReGqGzC1/OHOSYizzUKcH8dA854vEJ6dHNsaSgVDjIofIgoaaf2hFB4P4ZSAV5QxFPU pbhkQdJatH5KX4Of8D32lzV3LyPV8irtXnWtMyc7/YVbYPx31vT8c4otvkN5OEeq42BaMe uBKiNinTWZiWfvs9vEaooqZAC0kLUeo= X-MC-Unique: HYEORWo-MeyIGJHgEXcq1w-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 10/17] network: remove any code dealing with radvd Date: Tue, 14 Dec 2021 20:09:26 +0100 Message-Id: <697d2d9332d6997ef008b368aa75fd70f6d6e1ff.1639508754.git.jtomko@redhat.com> 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.79 on 10.5.11.12 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: 1639509068102100001 Since dnsmasq supports --ra-param for a long time, this code is now unused. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Laine Stump --- src/network/bridge_driver.c | 248 +----------------------------------- 1 file changed, 6 insertions(+), 242 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index a4535b1b49..39f6ed14e1 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -371,20 +371,6 @@ networkDnsmasqConfigFileName(virNetworkDriverState *dr= iver, } =20 =20 -static char * -networkRadvdPidfileBasename(const char *netname) -{return g_strdup_printf("%s-radvd", netname); -} - - -static char * -networkRadvdConfigFileName(virNetworkDriverState *driver, - const char *netname) -{ - return g_strdup_printf("%s/%s-radvd.conf", driver->radvdStateDir, netn= ame); -} - - /* do needed cleanup steps and remove the network from the list */ static int networkRemoveInactive(virNetworkDriverState *driver, @@ -392,15 +378,13 @@ networkRemoveInactive(virNetworkDriverState *driver, { g_autofree char *leasefile =3D NULL; g_autofree char *customleasefile =3D NULL; - g_autofree char *radvdconfigfile =3D NULL; g_autofree char *configfile =3D NULL; - g_autofree char *radvdpidbase =3D NULL; g_autofree char *statusfile =3D NULL; g_autofree char *macMapFile =3D NULL; g_autoptr(dnsmasqContext) dctx =3D NULL; virNetworkDef *def =3D virNetworkObjGetPersistentDef(obj); =20 - /* remove the (possibly) existing dnsmasq and radvd files */ + /* remove the (possibly) existing dnsmasq files */ if (!(dctx =3D dnsmasqContextNew(def->name, driver->dnsmasqStateDir))) { return -1; @@ -412,12 +396,6 @@ networkRemoveInactive(virNetworkDriverState *driver, if (!(customleasefile =3D networkDnsmasqLeaseFileNameCustom(driver, de= f->bridge))) return -1; =20 - if (!(radvdconfigfile =3D networkRadvdConfigFileName(driver, def->name= ))) - return -1; - - if (!(radvdpidbase =3D networkRadvdPidfileBasename(def->name))) - return -1; - if (!(configfile =3D networkDnsmasqConfigFileName(driver, def->name))) return -1; =20 @@ -436,10 +414,6 @@ networkRemoveInactive(virNetworkDriverState *driver, /* MAC map manager */ unlink(macMapFile); =20 - /* radvd */ - unlink(radvdconfigfile); - virPidFileDelete(driver->pidDir, radvdpidbase); - /* remove status file */ unlink(statusfile); =20 @@ -556,26 +530,15 @@ networkUpdateState(virNetworkObj *obj, =20 virNetworkObjPortForEach(obj, networkUpdatePort, obj); =20 - /* Try and read dnsmasq/radvd pids of active networks */ + /* Try and read dnsmasq pids of active networks */ if (virNetworkObjIsActive(obj) && def->ips && (def->nips > 0)) { - pid_t radvdPid; pid_t dnsmasqPid; - g_autofree char *radvdpidbase =3D NULL; =20 ignore_value(virPidFileReadIfAlive(driver->pidDir, def->name, &dnsmasqPid, dnsmasqCapsGetBinaryPath(dnsmas= q_caps))); virNetworkObjSetDnsmasqPid(obj, dnsmasqPid); - - radvdpidbase =3D networkRadvdPidfileBasename(def->name); - if (!radvdpidbase) - goto cleanup; - - ignore_value(virPidFileReadIfAlive(driver->pidDir, - radvdpidbase, - &radvdPid, RADVD)); - virNetworkObjSetRadvdPid(obj, radvdPid); } =20 ret =3D 0; @@ -690,7 +653,6 @@ networkStateInitialize(bool privileged, network_driver->stateDir =3D g_strdup(RUNSTATEDIR "/libvirt/networ= k"); network_driver->pidDir =3D g_strdup(RUNSTATEDIR "/libvirt/network"= ); network_driver->dnsmasqStateDir =3D g_strdup(LOCALSTATEDIR "/lib/l= ibvirt/dnsmasq"); - network_driver->radvdStateDir =3D g_strdup(LOCALSTATEDIR "/lib/lib= virt/radvd"); } else { configdir =3D virGetUserConfigDirectory(); rundir =3D virGetUserRuntimeDirectory(); @@ -700,7 +662,6 @@ networkStateInitialize(bool privileged, network_driver->stateDir =3D g_strdup_printf("%s/network/lib", run= dir); network_driver->pidDir =3D g_strdup_printf("%s/network/run", rundi= r); network_driver->dnsmasqStateDir =3D g_strdup_printf("%s/dnsmasq/li= b", rundir); - network_driver->radvdStateDir =3D g_strdup_printf("%s/radvd/lib", = rundir); } =20 if (g_mkdir_with_parents(network_driver->stateDir, 0777) < 0) { @@ -847,7 +808,6 @@ networkStateCleanup(void) g_free(network_driver->stateDir); g_free(network_driver->pidDir); g_free(network_driver->dnsmasqStateDir); - g_free(network_driver->radvdStateDir); =20 virObjectUnref(network_driver->dnsmasqCaps); =20 @@ -1697,170 +1657,6 @@ networkRestartDhcpDaemon(virNetworkDriverState *dri= ver, } =20 =20 -static char radvd1[] =3D " AdvOtherConfigFlag off;\n\n"; -static char radvd2[] =3D " AdvAutonomous off;\n"; -static char radvd3[] =3D " AdvOnLink on;\n" - " AdvAutonomous on;\n" - " AdvRouterAddr off;\n"; - -static int -networkRadvdConfContents(virNetworkObj *obj, - char **configstr) -{ - virNetworkDef *def =3D virNetworkObjGetDef(obj); - g_auto(virBuffer) configbuf =3D VIR_BUFFER_INITIALIZER; - size_t i; - virNetworkIPDef *ipdef; - bool v6present =3D false, dhcp6 =3D false; - - *configstr =3D NULL; - - /* Check if DHCPv6 is needed */ - for (i =3D 0; (ipdef =3D virNetworkDefGetIPByIndex(def, AF_INET6, i));= i++) { - v6present =3D true; - if (ipdef->nranges || ipdef->nhosts) { - dhcp6 =3D true; - break; - } - } - - /* If there are no IPv6 addresses, then we are done */ - if (!v6present) - return 0; - - /* create radvd config file appropriate for this network; - * IgnoreIfMissing allows radvd to start even when the bridge is down - */ - virBufferAsprintf(&configbuf, "interface %s\n" - "{\n" - " AdvSendAdvert on;\n" - " IgnoreIfMissing on;\n" - " AdvManagedFlag %s;\n" - "%s", - def->bridge, - dhcp6 ? "on" : "off", - dhcp6 ? "\n" : radvd1); - - /* add a section for each IPv6 address in the config */ - for (i =3D 0; (ipdef =3D virNetworkDefGetIPByIndex(def, AF_INET6, i));= i++) { - int prefix; - g_autofree char *netaddr =3D NULL; - - prefix =3D virNetworkIPDefPrefix(ipdef); - if (prefix < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("bridge '%s' has an invalid prefix"), - def->bridge); - return -1; - } - if (!(netaddr =3D virSocketAddrFormat(&ipdef->address))) - return -1; - - virBufferAsprintf(&configbuf, - " prefix %s/%d\n" - " {\n%s };\n", - netaddr, prefix, - dhcp6 ? radvd2 : radvd3); - } - - virBufferAddLit(&configbuf, "};\n"); - - *configstr =3D virBufferContentAndReset(&configbuf); - - return 0; -} - - -/* write file and return its name (which must be freed by caller) */ -static int -networkRadvdConfWrite(virNetworkDriverState *driver, - virNetworkObj *obj, - char **configFile) -{ - virNetworkDef *def =3D virNetworkObjGetDef(obj); - g_autofree char *configStr =3D NULL; - g_autofree char *myConfigFile =3D NULL; - - if (!configFile) - configFile =3D &myConfigFile; - - *configFile =3D NULL; - - if (networkRadvdConfContents(obj, &configStr) < 0) - return -1; - - if (!configStr) - return 0; - - /* construct the filename */ - if (!(*configFile =3D networkRadvdConfigFileName(driver, def->name))) - return -1; - - /* write the file */ - if (virFileWriteStr(*configFile, configStr, 0600) < 0) { - virReportSystemError(errno, - _("couldn't write radvd config file '%s'"), - *configFile); - return -1; - } - - return 0; -} - - -static int -networkStartRadvd(virNetworkDriverState *driver G_GNUC_UNUSED, - virNetworkObj *obj) -{ - virNetworkObjSetRadvdPid(obj, -1); - - return 0; -} - - -static int -networkRefreshRadvd(virNetworkDriverState *driver, - virNetworkObj *obj) -{ - virNetworkDef *def =3D virNetworkObjGetDef(obj); - g_autofree char *radvdpidbase =3D NULL; - g_autofree char *pidfile =3D NULL; - - if ((radvdpidbase =3D networkRadvdPidfileBasename(def->name)) && - (pidfile =3D virPidFileBuildPath(driver->pidDir, radvdpidbase))) { - /* radvd should not be running but in case it is */ - virPidFileForceCleanupPath(pidfile); - virNetworkObjSetRadvdPid(obj, -1); - } - return 0; -} - - -#if 0 -/* currently unused, so it causes a build error unless we #if it out */ -static int -networkRestartRadvd(virNetworkObj *obj) -{ - virNetworkDef *def =3D virNetworkObjGetDef(obj); - g_autofree char *radvdpidbase =3D NULL; - g_autofree char *pidfile =3D NULL; - - /* If there is a running radvd, kill it. Essentially ignore errors fro= m the - * following two functions, since there's really no better recovery to= be - * done than to just push ahead (and that may be exactly what's needed= ). - */ - if ((radvdpidbase =3D networkRadvdPidfileBasename(def->name)) && - (pidfile =3D virPidFileBuildPath(driver->pidDir, radvdpidbase))) { - virPidFileForceCleanupPath(pidfile); - virNetworkObjSetRadvdPid(obj, -1); - } - - /* now start radvd if it should be started */ - return networkStartRadvd(obj); -} -#endif /* #if 0 */ - - static int networkRefreshDaemonsHelper(virNetworkObj *obj, void *opaque) @@ -1877,13 +1673,11 @@ networkRefreshDaemonsHelper(virNetworkObj *obj, case VIR_NETWORK_FORWARD_ROUTE: case VIR_NETWORK_FORWARD_OPEN: /* Only the three L3 network types that are configured by - * libvirt will have a dnsmasq or radvd daemon associated + * libvirt will have a dnsmasq daemon associated * with them. Here we send a SIGHUP to an existing - * dnsmasq and/or radvd, or restart them if they've - * disappeared. + * dnsmasq, or restart it if it has disappeared. */ networkRefreshDhcpDaemon(driver, obj); - networkRefreshRadvd(driver, obj); break; =20 case VIR_NETWORK_FORWARD_BRIDGE: @@ -1906,7 +1700,7 @@ networkRefreshDaemonsHelper(virNetworkObj *obj, } =20 =20 -/* SIGHUP/restart any dnsmasq or radvd daemons. +/* SIGHUP/restart any dnsmasq * This should be called when libvirtd is restarted. */ static void @@ -2263,10 +2057,6 @@ networkStartNetworkVirtual(virNetworkDriverState *dr= iver, =20 dnsmasqStarted =3D true; =20 - /* start radvd if there are any ipv6 addresses */ - if (v6present && networkStartRadvd(driver, obj) < 0) - goto error; - if (virNetDevBandwidthSet(def->bridge, def->bandwidth, true, true) < 0) goto error; =20 @@ -2300,28 +2090,16 @@ networkStartNetworkVirtual(virNetworkDriverState *d= river, =20 =20 static int -networkShutdownNetworkVirtual(virNetworkDriverState *driver, +networkShutdownNetworkVirtual(virNetworkDriverState *driver G_GNUC_UNUSED, virNetworkObj *obj) { virNetworkDef *def =3D virNetworkObjGetDef(obj); - pid_t radvdPid; pid_t dnsmasqPid; =20 if (def->bandwidth) virNetDevBandwidthClear(def->bridge); =20 virNetworkObjUnrefMacMap(obj); - - radvdPid =3D virNetworkObjGetRadvdPid(obj); - if (radvdPid > 0) { - g_autofree char *radvdpidbase =3D NULL; - - kill(radvdPid, SIGTERM); - /* attempt to delete the pidfile we created */ - if ((radvdpidbase =3D networkRadvdPidfileBasename(def->name))) - virPidFileDelete(driver->pidDir, radvdpidbase); - } - dnsmasqPid =3D virNetworkObjGetDnsmasqPid(obj); if (dnsmasqPid > 0) kill(dnsmasqPid, SIGTERM); @@ -2350,12 +2128,6 @@ networkShutdownNetworkVirtual(virNetworkDriverState = *driver, kill(dnsmasqPid, SIGKILL); virNetworkObjSetDnsmasqPid(obj, -1); =20 - radvdPid =3D virNetworkObjGetRadvdPid(obj); - if (radvdPid > 0 && - (kill(radvdPid, 0) =3D=3D 0)) - kill(radvdPid, SIGKILL); - virNetworkObjSetRadvdPid(obj, -1); - return 0; } =20 @@ -3634,14 +3406,6 @@ networkUpdate(virNetworkPtr net, =20 } =20 - if (section =3D=3D VIR_NETWORK_SECTION_IP) { - /* only a change in IP addresses will affect radvd, and all of= radvd's - * config is stored in the conf file which will be re-read wit= h a SIGHUP. - */ - if (networkRefreshRadvd(driver, obj) < 0) - goto cleanup; - } - /* save current network state to disk */ if ((ret =3D virNetworkObjSaveStatus(driver->stateDir, obj, network_driver->xmlopt)) <= 0) --=20 2.31.1 From nobody Sun May 5 23:27:13 2024 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=1639509067; cv=none; d=zohomail.com; s=zohoarc; b=M7hhp9s3KoqyHXVygIwDz0TUybvVzjZxCyBmh7HVsjlVTJsAJtXAtKeFsoHx/ykLpRfH+6oAlUJIMt/mMsp4aNWiuYdfWezMvS+Pg86SPxt6cS+7MX7M3jjOmksN0U5g66fgc24XYt5g4DRNDGILpKMzHQx304NJnjnaBxPg8OY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1639509067; 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=ruNNcAlrOqx/hmfCX6cHfdcDOKJWiutbaidrUSvpU/E=; b=NYWOZb53eSomk1DMvFyKeCkUfRDXJtI6KhTBSqKWf8TM7WTs9JJAqf5ydvN2FJkh7A6PNnX1gR+A5R6yrLuVVJ7uaLIFwT9sSKoHE1BK62VWOpLGIcJn8jr/x8Y6SIs2CS9Ff6xolv4pKrOXxTtwZA7M1Z0oDbUhFDH9AZ+Lei4= 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 1639509067580934.6909032353324; Tue, 14 Dec 2021 11:11:07 -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-303-v95p9IWZOKGBU-TJVq321g-1; Tue, 14 Dec 2021 14:11:02 -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 95C4B192FDB5; Tue, 14 Dec 2021 19:10:53 +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 7327310AD786; Tue, 14 Dec 2021 19:10:53 +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 30DAF1802E2B; Tue, 14 Dec 2021 19:10:53 +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 1BEJAniu001249 for ; Tue, 14 Dec 2021 14:10:49 -0500 Received: by smtp.corp.redhat.com (Postfix) id CAC74610AE; Tue, 14 Dec 2021 19:10:49 +0000 (UTC) Received: from hjs.redhat.com (unknown [10.43.2.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 51C01610A7 for ; Tue, 14 Dec 2021 19:10:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1639509066; 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=ruNNcAlrOqx/hmfCX6cHfdcDOKJWiutbaidrUSvpU/E=; b=RyKOp3zggNfiF1W9MbkfQJusfRjKPv49mHA+W+EoIaulgDRb7P1lcuAko3G21RJvQYj1P6 6YIj6cpG/YwAQbHKyOmMQ6dnqXrbkuq7zB06TDfZXe+RJD/TGmoYzTGT6I0za5khrQztXE L1PY3Cf8Jxfqg6TJPci1yidDZE9TICo= X-MC-Unique: v95p9IWZOKGBU-TJVq321g-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 11/17] network: driver: remove unused radvdStateDir variable Date: Tue, 14 Dec 2021 20:09:27 +0100 Message-Id: <54c25c6ee6c463c7c8b0e60bb9669d469a2b4455.1639508754.git.jtomko@redhat.com> 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: 1639509068432100005 Signed-off-by: J=C3=A1n Tomko Reviewed-by: Laine Stump --- src/network/bridge_driver_platform.h | 1 - 1 file changed, 1 deletion(-) diff --git a/src/network/bridge_driver_platform.h b/src/network/bridge_driv= er_platform.h index 884fa82831..de7cbc1195 100644 --- a/src/network/bridge_driver_platform.h +++ b/src/network/bridge_driver_platform.h @@ -46,7 +46,6 @@ struct _virNetworkDriverState { char *stateDir; char *pidDir; char *dnsmasqStateDir; - char *radvdStateDir; =20 /* Require lock to get a reference on the object, * lockless access thereafter --=20 2.31.1 From nobody Sun May 5 23:27:13 2024 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=1639509067; cv=none; d=zohomail.com; s=zohoarc; b=emlRC3iUbo6w9XPZvLZ76LU1nQy/Lr8Y+9pJsGLdMvpxi93ixhd6FiC+PX4GOMfeUwSP/A1drAIbRT1YVldSuAqt9c/BStuCXVurUC8ZlFC7V78P2WNJ13lxHhuyhdCeCvTEzlBZ/gkh7yhIxsiDKDQBo0j4V/sLYYfxfvcbxM0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1639509067; 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=RFj1JxXvctoOhSTmZs9plzQY+uaG4o9jYrM4IiLKIIg=; b=QYTR29cOt4v3J8MZQ/+yWcO3JGr9FPVMqDbihwDj2D5vWZpjDFhNlSdAwyedGK9r585TH57snrF4zjYjkS3CjRuwWOi5tKgG7DNdNfdYLBhDS3GI6wkEmwKm2hkLnKsmLm8FjRuKqgK21r3AIVysSd57dYXGdUHwK/zr9oF5Cj8= 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 1639509067605543.4109131895774; Tue, 14 Dec 2021 11:11:07 -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-574-rRtesEAmO9Sj13OwGPKWAQ-1; Tue, 14 Dec 2021 14:11:02 -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 3238C81EE64; Tue, 14 Dec 2021 19:10:56 +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 15DE0A0F62; Tue, 14 Dec 2021 19:10:56 +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 DB0A24A707; Tue, 14 Dec 2021 19:10:55 +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 1BEJAonE001272 for ; Tue, 14 Dec 2021 14:10:50 -0500 Received: by smtp.corp.redhat.com (Postfix) id A0B88610AF; Tue, 14 Dec 2021 19:10:50 +0000 (UTC) Received: from hjs.redhat.com (unknown [10.43.2.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 24FAB610A7 for ; Tue, 14 Dec 2021 19:10:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1639509066; 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=RFj1JxXvctoOhSTmZs9plzQY+uaG4o9jYrM4IiLKIIg=; b=GrjhhjPH4U5Vx+AdMJMrXOwBkKsFqDh+HA7/6Gir/Kb8wMRsDpXhrjfW/OkRtOyQxtqOtO oz1KYCgjx6jQPuFBRUFNW70ad/rmDf70vctNfSoYVdUrbwBuBjK/eItBax1+YOQ1WPg86r ck9V41DijtRHIrnp8zDs5H2fmAI838w= X-MC-Unique: rRtesEAmO9Sj13OwGPKWAQ-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 12/17] conf: remove radvdPid from virNetworkObj Date: Tue, 14 Dec 2021 20:09:28 +0100 Message-Id: <6ce86994d28bb12f53a9d1a70f9117cb6cb6a0d8.1639508754.git.jtomko@redhat.com> 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.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-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1639509068464100006 Signed-off-by: J=C3=A1n Tomko Reviewed-by: Laine Stump --- src/conf/virnetworkobj.c | 16 ---------------- src/conf/virnetworkobj.h | 7 ------- src/libvirt_private.syms | 2 -- 3 files changed, 25 deletions(-) diff --git a/src/conf/virnetworkobj.c b/src/conf/virnetworkobj.c index 41c7dcba5c..f18eb35ae2 100644 --- a/src/conf/virnetworkobj.c +++ b/src/conf/virnetworkobj.c @@ -43,7 +43,6 @@ struct _virNetworkObj { virObjectLockable parent; =20 pid_t dnsmasqPid; - pid_t radvdPid; bool active; bool autostart; bool persistent; @@ -211,21 +210,6 @@ virNetworkObjSetDnsmasqPid(virNetworkObj *obj, } =20 =20 -pid_t -virNetworkObjGetRadvdPid(virNetworkObj *obj) -{ - return obj->radvdPid; -} - - -void -virNetworkObjSetRadvdPid(virNetworkObj *obj, - pid_t radvdPid) -{ - obj->radvdPid =3D radvdPid; -} - - virBitmap * virNetworkObjGetClassIdMap(virNetworkObj *obj) { diff --git a/src/conf/virnetworkobj.h b/src/conf/virnetworkobj.h index d980e9f38d..fadd277cbd 100644 --- a/src/conf/virnetworkobj.h +++ b/src/conf/virnetworkobj.h @@ -66,13 +66,6 @@ void virNetworkObjSetDnsmasqPid(virNetworkObj *obj, pid_t dnsmasqPid); =20 -pid_t -virNetworkObjGetRadvdPid(virNetworkObj *obj); - -void -virNetworkObjSetRadvdPid(virNetworkObj *obj, - pid_t radvdPid); - virBitmap * virNetworkObjGetClassIdMap(virNetworkObj *obj); =20 diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index f5a816b002..36f826e2ed 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1248,7 +1248,6 @@ virNetworkObjGetMacMap; virNetworkObjGetNewDef; virNetworkObjGetPersistentDef; virNetworkObjGetPortStatusDir; -virNetworkObjGetRadvdPid; virNetworkObjIsActive; virNetworkObjIsAutostart; virNetworkObjIsPersistent; @@ -1276,7 +1275,6 @@ virNetworkObjSetDefTransient; virNetworkObjSetDnsmasqPid; virNetworkObjSetFloorSum; virNetworkObjSetMacMap; -virNetworkObjSetRadvdPid; virNetworkObjTaint; virNetworkObjUnrefMacMap; virNetworkObjUnsetDefTransient; --=20 2.31.1 From nobody Sun May 5 23:27:13 2024 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=1639509066; cv=none; d=zohomail.com; s=zohoarc; b=AmNSlKVmeExF9fbyVDbE0pHY2iwTVs16uGB3OY1rhU+kSZ3IKwpyxd3EoYVaHLjNrlUfA9iZ2T4XysnOH7kot1kvfQIoq7lOQtkB36oU8lovQQklRARQIrre6F4aB4d8eFw/+8+iTyiwPUVhKIL8JeB7m/bK5pGw+xGXaKiUd5k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1639509066; 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=0l1BKKblPXGV6/3fK4lelnVX//qI3rVmKXXWe4aefeM=; b=YZ2H90tGfVt56kOWFzuDwY7lD3SPTPQ0Ssj8/NU3eUqEPvh4JoOjJq5e1Ncnf+1XcJ0X64IX6VCpkBpcm+bmCSWedxlJgUc1bP7b/NfVXCR8wo9TBl3QYXtvpdrsJ3WZ97qgXBPWVh7cx0PzSaXI6+nC/uRME8VKGFmzddR9ouk= 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 1639509066878140.37526688971457; Tue, 14 Dec 2021 11:11:06 -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-104-7XkHvYH8M-WhZ_icrinGuA-1; Tue, 14 Dec 2021 14:11:04 -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 B72A0100C668; Tue, 14 Dec 2021 19:10:57 +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 9162C5BE00; Tue, 14 Dec 2021 19:10:57 +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 608381802E2B; Tue, 14 Dec 2021 19:10:57 +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 1BEJApWm001284 for ; Tue, 14 Dec 2021 14:10:51 -0500 Received: by smtp.corp.redhat.com (Postfix) id 73453610AE; Tue, 14 Dec 2021 19:10:51 +0000 (UTC) Received: from hjs.redhat.com (unknown [10.43.2.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id EC356610A7 for ; Tue, 14 Dec 2021 19:10:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1639509065; 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=0l1BKKblPXGV6/3fK4lelnVX//qI3rVmKXXWe4aefeM=; b=PEviDrAl30o5rHXVaUHrgM9CrusK24N5dILVs1eeo7xrKBeUl9Usk1l+OcBe0mouRdMrNq aqc+LrMxDHtaMYstbEsFW1XnwO0f9wbmFifbyaYwa+BZm4rUgz3ATTAuVhxTedLdsxxRIs utaxcWaZwgXEbqnf4aBMyV44umzHlIA= X-MC-Unique: 7XkHvYH8M-WhZ_icrinGuA-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 13/17] build: do not search for radvd binary Date: Tue, 14 Dec 2021 20:09:29 +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.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-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1639509068158100002 Signed-off-by: J=C3=A1n Tomko Reviewed-by: Laine Stump --- meson.build | 1 - 1 file changed, 1 deletion(-) diff --git a/meson.build b/meson.build index cea8bbfa0c..0b7a2a69c1 100644 --- a/meson.build +++ b/meson.build @@ -860,7 +860,6 @@ optional_programs =3D [ 'modprobe', 'ovs-vsctl', 'pdwtags', - 'radvd', 'rmmod', 'scrub', 'tc', --=20 2.31.1 From nobody Sun May 5 23:27:13 2024 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=1639509092; cv=none; d=zohomail.com; s=zohoarc; b=V8+Ew33kRMlsiiOK0ojnx/XWBKCGGYltmkrxnyfmtiV4hSRwIgsWLQKGD5SlJGJ6O/CtAleYoEc6Xcv62wEl2Zi4CH0OvX/SvB/oOrfeHTn1lWRdQI+rMg4XZS+EqBwu8k5j1kY0iHJtGoSh579XCyBUppLVe7DITPbBi1mlEJA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1639509092; 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=XOY95sxiwtQRMCDmFVpI67ppjJCvRt6HneQ/qJ9OUKY=; b=FS8jeDkMXIZfvLh6qK6pnI23mp5zJFcxAj3wI3DnQ2B1nWFgovli9UlcVSzf6gPbbZ3tCnq4dnJkO+nxJTAicTzKNbZmDqoIXwe83WvVgmeGuc5F+RWE7NITAdKxuEPAc2XYjUGJAZN04XmuKzrV+sO0FijTHsB9GK/GVv4TUyk= 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 1639509092194435.3581861369678; Tue, 14 Dec 2021 11:11:32 -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-479-jg9AsQFzNjqD1J1uoWRejQ-1; Tue, 14 Dec 2021 14:11:06 -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 B232A81EE88; Tue, 14 Dec 2021 19:11:00 +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 5747610A4B5F; Tue, 14 Dec 2021 19:11: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 1CF094A709; Tue, 14 Dec 2021 19:11:00 +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 1BEJAqQA001292 for ; Tue, 14 Dec 2021 14:10:52 -0500 Received: by smtp.corp.redhat.com (Postfix) id 477E0610AE; Tue, 14 Dec 2021 19:10:52 +0000 (UTC) Received: from hjs.redhat.com (unknown [10.43.2.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id C18D9610A7 for ; Tue, 14 Dec 2021 19:10:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1639509091; 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=XOY95sxiwtQRMCDmFVpI67ppjJCvRt6HneQ/qJ9OUKY=; b=UAqaSh4BYdhjkN9XrE7tch93SRVyuBi0Kq/MBtd5sVKuY7IV/gvA6RJrGvDgVbovJ+In64 q9kTKcDeEVSt44K1I8+miUZ+oqLBt1VkLzNbk/fcrXPAf86pBr/j4ras7ip+s1YZJvi2UR kdaXvtCoBk5NRm0FJWKkcH314S03iuQ= X-MC-Unique: jg9AsQFzNjqD1J1uoWRejQ-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 14/17] spec: do not require radvd Date: Tue, 14 Dec 2021 20:09:30 +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: 1639509094191100001 Signed-off-by: J=C3=A1n Tomko Reviewed-by: Laine Stump --- libvirt.spec.in | 2 -- 1 file changed, 2 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 32b4243d0a..b37c6e17f3 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -283,7 +283,6 @@ BuildRequires: libnl3-devel BuildRequires: libselinux-devel BuildRequires: dnsmasq >=3D 2.41 BuildRequires: iptables -BuildRequires: radvd BuildRequires: ebtables BuildRequires: module-init-tools BuildRequires: cyrus-sasl-devel @@ -464,7 +463,6 @@ Summary: Network driver plugin for the libvirtd daemon Requires: libvirt-daemon =3D %{version}-%{release} Requires: libvirt-libs =3D %{version}-%{release} Requires: dnsmasq >=3D 2.41 -Requires: radvd Requires: iptables =20 %description daemon-driver-network --=20 2.31.1 From nobody Sun May 5 23:27:13 2024 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=1639509123; cv=none; d=zohomail.com; s=zohoarc; b=cnCeGI6SmFiPBQhFiTdtC17R/azk7KnrmZRhVuJeURIJ7ntp45UnjSLn7xIcdwnzRMd3Abh53rAWweC4lQqA8VYvFyrq6enQwK4Ju9M0TScj7yk8m18s4aK3dcwkOvhHonmlO3zCdxQu9cnoum218poyCieyDzsVHUcufR8T1Uw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1639509123; 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=i2JeOkhZodC26QUUwucW2j0/OpDNUw8GutVWm0NJzFU=; b=bH4nj3iXR5ManOpYRQlqWJdfGkuzG6oZHVX7cWCGTrJk+6j/fH3NV+/m/stI9hF+cB6DYGIMhnTsvFASSy0TZPe2l7HxZiIgYysLn7+gHONo5MBCn7rI0CQ1D/oHh9K/DJDGcBVeIrwykkKVtlzJpKvWj+7qRlEAx6dRfRv3Mts= 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 1639509123958947.1324669438276; Tue, 14 Dec 2021 11:12:03 -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-170-bGRIJ784NOmTK5k4a4tsbw-1; Tue, 14 Dec 2021 14:11:14 -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 8DA95192FDA1; Tue, 14 Dec 2021 19:11:09 +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 71FD15BD00; Tue, 14 Dec 2021 19:11:09 +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 1D23C1802E2B; Tue, 14 Dec 2021 19:11:09 +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 1BEJB8Lo001531 for ; Tue, 14 Dec 2021 14:11:08 -0500 Received: by smtp.corp.redhat.com (Postfix) id 00AC5610DF; Tue, 14 Dec 2021 19:11:08 +0000 (UTC) Received: from hjs.redhat.com (unknown [10.43.2.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7BF5F610A7 for ; Tue, 14 Dec 2021 19:10:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1639509122; 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=i2JeOkhZodC26QUUwucW2j0/OpDNUw8GutVWm0NJzFU=; b=LH/gP3Xg3GorQ3vI8YgSwK3sfbenTfY6cxchSjeiBW+8IVAuKcQqRf+V3OYyHNOO5uq4X0 CwWrNqYKZKxnT3GvTfC5OOjm88J+5fR2UTUUywjHJFh5RBhS2LyCzhXkn9cs3C7nRLum71 uLxb1vH6fPl7rMGoqCqfZ6371AWzNxQ= X-MC-Unique: bGRIJ784NOmTK5k4a4tsbw-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 15/17] util: remove dnsmasqCapsGetVersion Date: Tue, 14 Dec 2021 20:09:31 +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.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-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1639509126057100001 It has no callers anymore. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Laine Stump --- src/libvirt_private.syms | 1 - src/util/virdnsmasq.c | 9 --------- src/util/virdnsmasq.h | 1 - 3 files changed, 11 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 36f826e2ed..8ed50d1c45 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -2123,7 +2123,6 @@ dnsmasqAddDhcpHost; dnsmasqAddHost; dnsmasqCapsGet; dnsmasqCapsGetBinaryPath; -dnsmasqCapsGetVersion; dnsmasqCapsNewFromBinary; dnsmasqCapsNewFromBuffer; dnsmasqContextFree; diff --git a/src/util/virdnsmasq.c b/src/util/virdnsmasq.c index 016d9d64a8..d086647362 100644 --- a/src/util/virdnsmasq.c +++ b/src/util/virdnsmasq.c @@ -759,15 +759,6 @@ dnsmasqCapsGetBinaryPath(dnsmasqCaps *caps) return caps ? caps->binaryPath : DNSMASQ; } =20 -unsigned long -dnsmasqCapsGetVersion(dnsmasqCaps *caps) -{ - if (caps) - return caps->version; - else - return 0; -} - bool dnsmasqCapsGet(dnsmasqCaps *caps, dnsmasqCapsFlags flag) { diff --git a/src/util/virdnsmasq.h b/src/util/virdnsmasq.h index 9aa45c3046..10b512cff4 100644 --- a/src/util/virdnsmasq.h +++ b/src/util/virdnsmasq.h @@ -99,6 +99,5 @@ dnsmasqCaps *dnsmasqCapsNewFromBuffer(const char *buf); dnsmasqCaps *dnsmasqCapsNewFromBinary(void); bool dnsmasqCapsGet(dnsmasqCaps *caps, dnsmasqCapsFlags flag); const char *dnsmasqCapsGetBinaryPath(dnsmasqCaps *caps); -unsigned long dnsmasqCapsGetVersion(dnsmasqCaps *caps); char *dnsmasqDhcpHostsToString(dnsmasqDhcpHost *hosts, unsigned int nhosts); --=20 2.31.1 From nobody Sun May 5 23:27:13 2024 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=1639509082; cv=none; d=zohomail.com; s=zohoarc; b=OVCzcuPjU+OwCWExau1fYNwdNkw3jNYWk2NwuA/nQwbdX08tUjA8ePWgYJn4cEUUm62wFHHh617hAhJ2vLzrVLCZcotfyAPUvEez7biAwKf6/HCtUq4Z8I6m911Y+I3NJxMi/4QvdlswTAtN/6Ajgb3SgdLNH8zXg4l8JRniDCE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1639509082; 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=n78EBvltDoULzMgtjtQUVpAAIKqaHJbUpFKgXGe7Bqw=; b=BYx5DVqIPGzZKMK8XREi/9gZU3KR1rWetxgY2GsQB4JBy8FmkMt3sBvUZa0V9mXoUBvtG1JGYdBuVBxc/jZQRNUaP67TfVxb3gUsJopqmKN+knl/NwqraA3SbVVUKIZh+RkRpCW4bjCO3nKxYXPfICRb0k8YnFhC8wy04thHaGw= 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 163950908261238.659308008755715; Tue, 14 Dec 2021 11:11:22 -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-532-wW0SAXd3OGS8WyixaYwmSg-1; Tue, 14 Dec 2021 14:11:17 -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 028CD800FF3; Tue, 14 Dec 2021 19:11:12 +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 DCB55A0F6A; Tue, 14 Dec 2021 19:11:11 +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 B03F91802E2D; Tue, 14 Dec 2021 19:11:11 +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 1BEJB88b001555 for ; Tue, 14 Dec 2021 14:11:08 -0500 Received: by smtp.corp.redhat.com (Postfix) id C865B18A4E; Tue, 14 Dec 2021 19:11:08 +0000 (UTC) Received: from hjs.redhat.com (unknown [10.43.2.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4F517610D0 for ; Tue, 14 Dec 2021 19:11:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1639509081; 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=n78EBvltDoULzMgtjtQUVpAAIKqaHJbUpFKgXGe7Bqw=; b=cDS1NSYteh9peTbfwMbolvgvsKtVl6Wy4AQ9UQ6Jpl1SOAu1IszRwqTvAZHLRyR2MWlFXF vwFwZVoKgOb6DCmBRm9Yh4zDy9CpMrJ4qK/kkcrG30hyw5Z5B5pjihpsZtQEtZqPyMPvYo SwH/HCt/SLI+mECM4hQryhQilQvpoRc= X-MC-Unique: wW0SAXd3OGS8WyixaYwmSg-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 16/17] util: dnsmasq: remove caps completely Date: Tue, 14 Dec 2021 20:09:32 +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.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-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1639509084260100001 Now that we only check whether the dnsmasq version is new enough, there is no need for the caps field. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Laine Stump --- src/libvirt_private.syms | 1 - src/util/virdnsmasq.c | 17 ----------------- src/util/virdnsmasq.h | 5 ----- 3 files changed, 23 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 8ed50d1c45..e6639f7644 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -2121,7 +2121,6 @@ virIsDevMapperDevice; # util/virdnsmasq.h dnsmasqAddDhcpHost; dnsmasqAddHost; -dnsmasqCapsGet; dnsmasqCapsGetBinaryPath; dnsmasqCapsNewFromBinary; dnsmasqCapsNewFromBuffer; diff --git a/src/util/virdnsmasq.c b/src/util/virdnsmasq.c index d086647362..1edc2d711b 100644 --- a/src/util/virdnsmasq.c +++ b/src/util/virdnsmasq.c @@ -578,7 +578,6 @@ struct _dnsmasqCaps { char *binaryPath; bool noRefresh; time_t mtime; - virBitmap *flags; unsigned long version; }; =20 @@ -589,7 +588,6 @@ dnsmasqCapsDispose(void *obj) { dnsmasqCaps *caps =3D obj; =20 - virBitmapFree(caps->flags); g_free(caps->binaryPath); } =20 @@ -603,13 +601,6 @@ static int dnsmasqCapsOnceInit(void) =20 VIR_ONCE_GLOBAL_INIT(dnsmasqCaps); =20 -static void -dnsmasqCapsSet(dnsmasqCaps *caps, - dnsmasqCapsFlags flag) -{ - ignore_value(virBitmapSetBit(caps->flags, flag)); -} - =20 #define DNSMASQ_VERSION_STR "Dnsmasq version " =20 @@ -718,7 +709,6 @@ dnsmasqCapsNewEmpty(const char *binaryPath) return NULL; if (!(caps =3D virObjectNew(dnsmasqCapsClass))) return NULL; - caps->flags =3D virBitmapNew(DNSMASQ_CAPS_LAST); caps->binaryPath =3D g_strdup(binaryPath ? binaryPath : DNSMASQ); return caps; } @@ -759,13 +749,6 @@ dnsmasqCapsGetBinaryPath(dnsmasqCaps *caps) return caps ? caps->binaryPath : DNSMASQ; } =20 -bool -dnsmasqCapsGet(dnsmasqCaps *caps, dnsmasqCapsFlags flag) -{ - return caps && virBitmapIsBitSet(caps->flags, flag); -} - - /** dnsmasqDhcpHostsToString: * * Turns a vector of dnsmasqDhcpHost into the string that is ought to be diff --git a/src/util/virdnsmasq.h b/src/util/virdnsmasq.h index 10b512cff4..c74cc887f8 100644 --- a/src/util/virdnsmasq.h +++ b/src/util/virdnsmasq.h @@ -67,10 +67,6 @@ typedef struct dnsmasqAddnHostsfile *addnhostsfile; } dnsmasqContext; =20 -typedef enum { - DNSMASQ_CAPS_LAST, /* this must always be the last item */ -} dnsmasqCapsFlags; - typedef struct _dnsmasqCaps dnsmasqCaps; =20 G_DEFINE_AUTOPTR_CLEANUP_FUNC(dnsmasqCaps, virObjectUnref); @@ -97,7 +93,6 @@ int dnsmasqReload(pid_t pid); =20 dnsmasqCaps *dnsmasqCapsNewFromBuffer(const char *buf); dnsmasqCaps *dnsmasqCapsNewFromBinary(void); -bool dnsmasqCapsGet(dnsmasqCaps *caps, dnsmasqCapsFlags flag); const char *dnsmasqCapsGetBinaryPath(dnsmasqCaps *caps); char *dnsmasqDhcpHostsToString(dnsmasqDhcpHost *hosts, unsigned int nhosts); --=20 2.31.1 From nobody Sun May 5 23:27:13 2024 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=1639509082; cv=none; d=zohomail.com; s=zohoarc; b=ZszP6jURpmZ0HNRGSNNg3JXuJPbXueKRVMGL4SVTbSJYNKECunLSAtDvJJcuyHvdW4po08W3n4ojtr8kLkTQ2hGLmzxUv/3rYmCzafDPoV7SXK7Gd0Q0QNsrsJHROI6Hqbl7nUxxC5KAPaR5R6TEa6QZVm5M882H36UlH0unDfw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1639509082; 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=jLlBXOdttJ1E9MXAukdI5nU9i9/GU3IeD11rszPCP4E=; b=RaSVClSuTj3ja2CUxl6nzZUrpezl7fdvmj4iwfWGGTBHwt7MlXMOcU8OEGZN6PlcWOVgM+j6n7GaMC1hpBglIk0W7pl5yRZ2l4xRD25swB7Y6xnh5/Gv7MD4+xWhdDtij+Nmm3l/kZ7dnq3VQzOgYzeBpCHxw/U9jKCDvsyZtA8= 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 1639509082723400.5233913819626; Tue, 14 Dec 2021 11:11:22 -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-594-aHLkiLktNE-LdXIykhmUqw-1; Tue, 14 Dec 2021 14:11:17 -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 E961F801B35; Tue, 14 Dec 2021 19:11:11 +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 D1EEBA0F68; Tue, 14 Dec 2021 19:11:11 +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 A6C414A708; Tue, 14 Dec 2021 19:11:11 +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 1BEJB9wP001566 for ; Tue, 14 Dec 2021 14:11:09 -0500 Received: by smtp.corp.redhat.com (Postfix) id 9A56518A4E; Tue, 14 Dec 2021 19:11:09 +0000 (UTC) Received: from hjs.redhat.com (unknown [10.43.2.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 21CF5610D0 for ; Tue, 14 Dec 2021 19:11:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1639509081; 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=jLlBXOdttJ1E9MXAukdI5nU9i9/GU3IeD11rszPCP4E=; b=fSCvL01qvu6cn8DhPo99TPjVqWB6QaFy7SbQmrds4AuNe16rHD5Wux4MZze7Ek0jksxJ/2 HvtCvjQcQSxs/l30ep5g0ZnkGp8fRqSNX3fSYcPkT/r1rQjoxG7AnPdGtZifQP2Nv7cnIX JtFxNIBGqtk3VAmbtLLBB884MSY04j4= X-MC-Unique: aHLkiLktNE-LdXIykhmUqw-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 17/17] network: remove unused 'driver' parameter Date: Tue, 14 Dec 2021 20:09:33 +0100 Message-Id: <1f5b0df2f4904ff3ba8fb6213044f17458a59d63.1639508754.git.jtomko@redhat.com> 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.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-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1639509084337100002 Signed-off-by: J=C3=A1n Tomko Reviewed-by: Laine Stump --- src/network/bridge_driver.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 39f6ed14e1..23d9ed4226 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -2090,8 +2090,7 @@ networkStartNetworkVirtual(virNetworkDriverState *dri= ver, =20 =20 static int -networkShutdownNetworkVirtual(virNetworkDriverState *driver G_GNUC_UNUSED, - virNetworkObj *obj) +networkShutdownNetworkVirtual(virNetworkObj *obj) { virNetworkDef *def =3D virNetworkObjGetDef(obj); pid_t dnsmasqPid; @@ -2419,7 +2418,7 @@ networkShutdownNetwork(virNetworkDriverState *driver, case VIR_NETWORK_FORWARD_NAT: case VIR_NETWORK_FORWARD_ROUTE: case VIR_NETWORK_FORWARD_OPEN: - ret =3D networkShutdownNetworkVirtual(driver, obj); + ret =3D networkShutdownNetworkVirtual(obj); break; =20 case VIR_NETWORK_FORWARD_BRIDGE: --=20 2.31.1