From nobody Fri Mar 14 06:46:45 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1725374301114816.4662011527462; Tue, 3 Sep 2024 07:38:21 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 0C5251256; Tue, 3 Sep 2024 10:38:20 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id F10F911ED; Tue, 3 Sep 2024 10:36:48 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 8CAB31211; Tue, 3 Sep 2024 10:36:36 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 27D6FBD7 for ; Tue, 3 Sep 2024 10:36:36 -0400 (EDT) Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-124-xYZPqsesMOuHvCUTkSNAjw-1; Tue, 03 Sep 2024 10:36:34 -0400 Received: by mail-wr1-f70.google.com with SMTP id ffacd0b85a97d-3756212a589so905584f8f.2 for ; Tue, 03 Sep 2024 07:36:34 -0700 (PDT) Received: from wheatley.localdomain (nat-pool-brq-t.redhat.com. [213.175.37.10]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3749ef7ea91sm14519680f8f.78.2024.09.03.07.36.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Sep 2024 07:36:32 -0700 (PDT) Received: from wheatley.brq.redhat.com (wheatley.k8r.cz [127.0.0.1]) by wheatley.localdomain (Postfix) with ESMTP id 554F01FC90BE for ; Tue, 03 Sep 2024 16:36:31 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.6 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1725374195; h=from:from: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; bh=97nF6wI/FyurHDcFf9I5jqE7kOLgtl2ArJHHIu4TC+8=; b=Sxaoj7oOIOUz5eqCZwALfDMzuSyTbcXNe96OHxOglyaz4V8uh9v0vZL9NubaI16Dyt3gFW /gifW4Ejh7GONeQvXwhTvalXG3MOzuoGbpIlKSRJuBQVKK7l1k2mQM2N7G+F3El2az3kqt JIm7Z+IhAGtmS51nBT8FeRwdFs+Qbks= X-MC-Unique: xYZPqsesMOuHvCUTkSNAjw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725374193; x=1725978993; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=97nF6wI/FyurHDcFf9I5jqE7kOLgtl2ArJHHIu4TC+8=; b=Nelx+uifyWTfiqfdSFzCDq25o9km5JHD36l6bht5yKD65MqqDNtz8Fn96cVnURmRX7 9fD9RmEiwXFoSYCsVKAYjpoYUjxkZw/BnO/4Z90yRq/glrJAS1JNvKWnbb1kfGbnLqDW mGBb423F7iP3lvENO9WmET2LOSHD9+ZhTqitH6DB6FThBzymiotDDrx/s0k9VW4k6AZ7 q/6Tm6NsAJvBymMKISUeJ2mjrZYypGAIN4njV0HdSuAnLE/C8YNI0uw8afXBXTgh/lAp yCIAc8z4/6TraEUEIUnRjg1XEVtFrOrVTVyps/WQHRdUEVgT1Kqs/HagunolEWXg3n6H jWyg== X-Gm-Message-State: AOJu0YzTuvRllZnOZ6ZshctuH2UAp/b7+A768Q5MqMOOaPqj6pZFVWjA HK5WBLo83wMgmoFeNEftIBfp0zzhWKF/HZBruPiqD0jZulKNfn7ZxzgvKHZnQ+Lknv55FLL9kkB zFip36tj38Nrvvnfx6VESlhd1p3V95Xho6JBhjHkWKq1ykQY9pTHtcolQadVFGdhnhBqpuyvIAQ +C8BjYSN58c52O5BsWYlmGgUesQH4bAME6Q01CNBM= X-Received: by 2002:a5d:5c87:0:b0:374:c8eb:9b18 with SMTP id ffacd0b85a97d-374c8eb9b69mr5119178f8f.24.1725374193306; Tue, 03 Sep 2024 07:36:33 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHpUW472cSVTKcnX2NBUMFnga+wm3sJqxvU+2hb4W6ukz+bC8Vzr98duZZa7IB+SptpyWKtXQ== X-Received: by 2002:a5d:5c87:0:b0:374:c8eb:9b18 with SMTP id ffacd0b85a97d-374c8eb9b69mr5119148f8f.24.1725374192645; Tue, 03 Sep 2024 07:36:32 -0700 (PDT) From: Martin Kletzander To: devel@lists.libvirt.org Subject: [PATCH 6/8] network: Try to read dnsmasq PIDs for inactive networks too Date: Tue, 3 Sep 2024 16:36:25 +0200 Message-ID: <874fb08a6b9592166f102bc40dd2f28481509af7.1725373964.git.mkletzan@redhat.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: E26C2XBHARZWW77GCBLIQU5LCVHU3M7N X-Message-ID-Hash: E26C2XBHARZWW77GCBLIQU5LCVHU3M7N X-MailFrom: mkletzan@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1725374302250116600 Content-Type: text/plain; charset="utf-8"; x-default="true" Just in case one needs a clean up. Resolves: https://issues.redhat.com/browse/RHEL-50968 Signed-off-by: Martin Kletzander Reviewed-by: Laine Stump --- src/network/bridge_driver.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index ebdb39d0743b..3ef3444da241 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -492,8 +492,9 @@ networkUpdateState(virNetworkObj *obj, if (virNetworkObjIsActive(obj)) virNetworkObjPortForEach(obj, networkUpdatePort, obj); =20 - /* Try and read dnsmasq pids of active networks */ - if (virNetworkObjIsActive(obj) && def->ips && (def->nips > 0)) { + /* Try and read dnsmasq pids of both active and inactive networks, jus= t in + * case a network became inactive and we need to clean up. */ + if (def->ips && (def->nips > 0)) { const char *binpath =3D NULL; pid_t dnsmasqPid; =20 --=20 2.46.0