From: Michal Privoznik <mprivozn@redhat.com>
Date: Thu, 10 Apr 2025 08:42:55 +0000 (+0200)
Subject: network: Suppress reporting an error when D-Bus is unavailable in networkStateInitial... 
X-Git-Tag: v11.3.0-rc1~44
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ac5874ba8771d9f83ddc9cbd67606f3b0964c102;p=thirdparty%2Flibvirt.git

network: Suppress reporting an error when D-Bus is unavailable in networkStateInitialize()

When the network driver initializes itself, it tries to subscribe
to signals from Firewalld sent over system D-Bus. Well, the code
is written in best effort mode, i.e. lack of D-Bus is not
considered an error. Problem is, virGDBusGetSystemBus() which is
used to obtain system D-Bus prints out an error in case of
lacking system D-Bus. This pollutes the logs (which may mislead
users) and goes against the best-effort nature of aforementioned
code. Check for the system D-Bus presence via
virGDBusHasSystemBus() first.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
---

diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c
index 2cad1c8cbe..34b655e816 100644
--- a/src/network/bridge_driver.c
+++ b/src/network/bridge_driver.c
@@ -710,7 +710,8 @@ networkStateInitialize(bool privileged,
     network_driver->networkEventState = virObjectEventStateNew();
 
 #ifdef WITH_FIREWALLD
-    if (!(sysbus = virGDBusGetSystemBus())) {
+    if (!virGDBusHasSystemBus() ||
+        !(sysbus = virGDBusGetSystemBus())) {
         VIR_WARN("DBus not available, disabling firewalld support "
                  "in bridge_network_driver: %s", virGetLastErrorMessage());
     } else {