From: Michal Privoznik <mprivozn@redhat.com>
Date: Mon, 17 Apr 2023 08:10:04 +0000 (+0200)
Subject: conf: Initialize _virNetworkObj::dnsmasqPid to -1 in virNetworkObjNew()
X-Git-Tag: v9.3.0-rc1~54
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=004d5141c59b08904396d53efe64ebe15f30c7b6;p=thirdparty%2Flibvirt.git

conf: Initialize _virNetworkObj::dnsmasqPid to -1 in virNetworkObjNew()

Throughout all of our network driver code we assume that
dnsmasqPid of value -1 means the network has no dnsmasq process
running. There are plenty of calls to:

  virNetworkObjSetDnsmasqPid(obj, -1);

or:

  pid_t dnsmasqPid = virNetworkObjGetDnsmasqPid(obj);
  if (dnsmasqPid > 0) ...;

Now, a virNetworkObj is created via virNetworkObjNew() which
might as well set this de-facto default value.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/src/conf/virnetworkobj.c b/src/conf/virnetworkobj.c
index 1726fc381f..b8b86da06f 100644
--- a/src/conf/virnetworkobj.c
+++ b/src/conf/virnetworkobj.c
@@ -117,6 +117,7 @@ virNetworkObjNew(void)
     ignore_value(virBitmapSetBit(obj->classIdMap, 2));
 
     obj->ports = virHashNew(virNetworkObjPortFree);
+    obj->dnsmasqPid = (pid_t)-1;
 
     virObjectLock(obj);