Remove static analysis assertions

None of them are currently needed to pass our upstream CI, most were
either for ancient clang versions or coverity for silencing false
positives.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>

diff --git a/src/conf/virdomainobjlist.c b/src/conf/virdomainobjlist.c
index e1d455eefefba1d109e58af4059f3d10e588310b..5f9fd9aabc10ff75ca0549e7d9685ad1010b06aa 100644 (file)
--- a/src/conf/virdomainobjlist.c
+++ b/src/conf/virdomainobjlist.c
@@ -980,7 +980,6 @@ virDomainObjListCollect(virDomainObjList *domlist,
     struct virDomainListData data = { NULL, 0 };
 
     virObjectRWLockRead(domlist);
-    sa_assert(domlist->objs);
     data.vms = g_new0(virDomainObj *, virHashSize(domlist->objs));
 
     virHashForEach(domlist->objs, virDomainObjListCollectIterator, &data);
@@ -1040,7 +1039,6 @@ virDomainObjListConvert(virDomainObjList *domlist,
     }
     virObjectRWUnlock(domlist);
 
-    sa_assert(*vms);
     virDomainObjListFilter(vms, nvms, conn, filter, flags);
 
     return 0;

diff --git a/src/conf/virnwfilterbindingobjlist.c b/src/conf/virnwfilterbindingobjlist.c
index fe97f2b3df2553d3f54d454fe2ac5651b1dd973d..1f19e27eb0ec709dce599ba5edfa1f3823e4e0c1 100644 (file)
--- a/src/conf/virnwfilterbindingobjlist.c
+++ b/src/conf/virnwfilterbindingobjlist.c
@@ -432,7 +432,6 @@ virNWFilterBindingObjListCollect(virNWFilterBindingObjList *domlist,
     struct virNWFilterBindingListData data = { NULL, 0 };
 
     virObjectRWLockRead(domlist);
-    sa_assert(domlist->objs);
     data.bindings = g_new0(virNWFilterBindingObj *, virHashSize(domlist->objs));
 
     virHashForEach(domlist->objs, virNWFilterBindingObjListCollectIterator, &data);

diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c
index 2b844bb3b5f931202cd139a13974ab526d6e1ae7..75da7d7ff219cd25bf7a0f91dd4bb135d8e293fb 100644 (file)
--- a/src/libxl/libxl_driver.c
+++ b/src/libxl/libxl_driver.c
@@ -1666,8 +1666,6 @@ libxlDomainSetMemoryFlags(virDomainPtr dom, unsigned long newmem,
         }
 
         if (flags & VIR_DOMAIN_MEM_CONFIG) {
-            /* Help clang 2.8 decipher the logic flow.  */
-            sa_assert(persistentDef);
             virDomainDefSetMemoryTotal(persistentDef, newmem);
             if (persistentDef->mem.cur_balloon > newmem)
                 persistentDef->mem.cur_balloon = newmem;
@@ -1702,7 +1700,6 @@ libxlDomainSetMemoryFlags(virDomainPtr dom, unsigned long newmem,
         }
 
         if (flags & VIR_DOMAIN_MEM_CONFIG) {
-            sa_assert(persistentDef);
             persistentDef->mem.cur_balloon = newmem;
             ret = virDomainDefSave(persistentDef, driver->xmlopt, cfg->configDir);
             goto endjob;
@@ -2476,9 +2473,6 @@ libxlDomainPinVcpuFlags(virDomainPtr dom, unsigned int vcpu,
     if (flags & VIR_DOMAIN_AFFECT_LIVE)
         targetDef = vm->def;
 
-    /* Make sure coverity knows targetDef is valid at this point. */
-    sa_assert(targetDef);
-
     pcpumap = virBitmapNewData(cpumap, maplen);
     if (!pcpumap)
         goto endjob;
@@ -2557,9 +2551,6 @@ libxlDomainGetVcpuPinInfo(virDomainPtr dom, int ncpumaps,
     if (flags & VIR_DOMAIN_AFFECT_LIVE)
         targetDef = vm->def;
 
-    /* Make sure coverity knows targetDef is valid at this point. */
-    sa_assert(targetDef);
-
     hostcpus = virBitmapNew(libxl_get_max_cpus(cfg->ctx));
     virBitmapSetAll(hostcpus);
 

diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
index 1e6f892e0814d6d2775a9f3b14f0b7f47c03ea05..8f35b4240f1d6309554ae435e1aa7bbbdecc07e8 100644 (file)
--- a/src/qemu/qemu_monitor.c
+++ b/src/qemu/qemu_monitor.c
@@ -398,9 +398,6 @@ qemuMonitorIOWriteWithFD(qemuMonitor *mon,
     msg.msg_controllen = sizeof(control);
 
     cmsg = CMSG_FIRSTHDR(&msg);
-    /* Some static analyzers, like clang 2.6-0.6.pre2, fail to see
-       that our use of CMSG_FIRSTHDR will not return NULL.  */
-    sa_assert(cmsg);
     cmsg->cmsg_len = CMSG_LEN(sizeof(int));
     cmsg->cmsg_level = SOL_SOCKET;
     cmsg->cmsg_type = SCM_RIGHTS;

diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 9dc6b71ae5d10aa1a5e0958552a89543f1d17902..8ada4feef8e19ce52a91592c53909716568d28a8 100644 (file)
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -2089,7 +2089,6 @@ qemuProcessReadLog(qemuDomainLogContext *logCtxt,
             *eol = '\n';
         }
     }
-    filter_next = NULL; /* silence false coverity warning */
 
     if (got > 0 &&
         buf[got - 1] == '\n') {

diff --git a/src/rpc/virnetserver.c b/src/rpc/virnetserver.c
index 42e06fcb59d1529068dc1dde943d4f3eb51ebafb..cfb65f8b5f63947f18dba083a7afd2aac9809d8e 100644 (file)
--- a/src/rpc/virnetserver.c
+++ b/src/rpc/virnetserver.c
@@ -937,10 +937,6 @@ virNetServerProcessClients(virNetServer *srv)
 
  reprocess:
     for (i = 0; i < srv->nclients; i++) {
-        /* Coverity 5.3.0 couldn't see that srv->clients is non-NULL
-         * if srv->nclients is non-zero.  */
-        sa_assert(srv->clients);
-
         client = srv->clients[i];
         virObjectLock(client);
         if (virNetServerClientWantCloseLocked(client))

diff --git a/src/util/vircommand.c b/src/util/vircommand.c
index 7abb2e288f69176b01f38f5301450e43c99520a1..6e01e4cb62e84de2e8486a27452ed77c8c9baaa9 100644 (file)
--- a/src/util/vircommand.c
+++ b/src/util/vircommand.c
@@ -2263,9 +2263,6 @@ virCommandProcessIO(virCommand *cmd)
                     buf = cmd->errbuf;
                     len = &errlen;
                 }
-                /* Silence a false positive from clang. */
-                sa_assert(buf);
-
                 done = read(fds[i].fd, data, sizeof(data));
                 if (done < 0) {
                     if (errno != EINTR &&

diff --git a/src/util/virconf.c b/src/util/virconf.c
index 15a65ec394f4fe847c2c3516303120543f1070e1..07ecfc7b57539dd4509099bf34b3e5add47cf772 100644 (file)
--- a/src/util/virconf.c
+++ b/src/util/virconf.c
@@ -472,12 +472,6 @@ virConfParseValue(virConfParserCtxt *ctxt)
         }
         while ((ctxt->cur < ctxt->end) && (CUR != ']')) {
 
-            /* Tell Clang that when execution reaches this point
-               "lst" is guaranteed to be non-NULL.  This stops it
-               from issuing an invalid NULL-dereference warning about
-               "prev = lst; while (prev->next..." below.  */
-            sa_assert(lst);
-
             if (CUR != ',') {
                 virConfError(ctxt, VIR_ERR_CONF_SYNTAX,
                              _("expecting a separator in list"));

diff --git a/src/util/virhostmem.c b/src/util/virhostmem.c
index ae42978ed29326f1dca2eb26d8067ee7b42e2b7d..8aa675cb4f86818ab637e89f114080cea3666026 100644 (file)
--- a/src/util/virhostmem.c
+++ b/src/util/virhostmem.c
@@ -313,7 +313,6 @@ virHostMemSetParameterValue(virTypedParameterPtr param)
     int rc = -1;
 
     char *field = strchr(param->field, '_');
-    sa_assert(field);
     field++;
     path = g_strdup_printf("%s/%s", SYSFS_MEMORY_SHARED_PATH, field);
 
@@ -338,7 +337,6 @@ virHostMemParametersAreAllSupported(virTypedParameterPtr params,
         virTypedParameterPtr param = &params[i];
 
         char *field = strchr(param->field, '_');
-        sa_assert(field);
         field++;
         path = g_strdup_printf("%s/%s", SYSFS_MEMORY_SHARED_PATH, field);
 

diff --git a/src/util/virobject.c b/src/util/virobject.c
index 7173b9136feb4f6e87c33e329cd119516ed637a9..3412985b7979c6da4ad53f09309b4988abad4877 100644 (file)
--- a/src/util/virobject.c
+++ b/src/util/virobject.c
@@ -182,7 +182,6 @@ virClassNew(virClass *parent,
         return NULL;
     } else if (objectSize <= parentSize ||
                parentSize != (parent ? parent->objectSize : 0)) {
-        sa_assert(parent);
         virReportInvalidArg(objectSize,
                             _("object size %zu of %s is not larger than parent class %zu"),
                             objectSize, name, parent->objectSize);

diff --git a/src/util/virutil.c b/src/util/virutil.c
index 3f49a469e509d7019b336635edee9b2740f09e78..311cbbf93ac218066b9f3f69cd7081a627e68bf4 100644 (file)
--- a/src/util/virutil.c
+++ b/src/util/virutil.c
@@ -512,9 +512,6 @@ virGetHostnameImpl(bool quiet)
         return g_strdup(hostname);
     }
 
-    /* Tell static analyzers about getaddrinfo semantics.  */
-    sa_assert(info);
-
     if (info->ai_canonname == NULL ||
         STRPREFIX(info->ai_canonname, "localhost"))
         /* in this case, we tried to canonicalize and we ended up back with

diff --git a/tests/commandtest.c b/tests/commandtest.c
index 57c7db67d85cff3c9c31a12c5ee26f71299a8486..5267e1bf1cea3d937f8c0f07c193e46664d905de 100644 (file)
--- a/tests/commandtest.c
+++ b/tests/commandtest.c
@@ -611,7 +611,6 @@ static int test17(const void *unused G_GNUC_UNUSED)
         goto cleanup;
     }
 
-    sa_assert(outbuf);
     if (*outbuf) {
         puts("output buffer is not an allocated empty string");
         goto cleanup;

diff --git a/tools/vsh.c b/tools/vsh.c
index ebaf17f3267d7ccb4bc8fc4f0553050862b1a540..123284c636ecca72b7ce010534fed07b77869134 100644 (file)
--- a/tools/vsh.c
+++ b/tools/vsh.c
@@ -449,7 +449,6 @@ vshCmddefGetOption(vshControl *ctl, const vshCmdDef *cmd, const char *name,
                    opt->help = "string": straight replacement of name
                    opt->help = "string=value": treat boolean flag as
                    alias of option and its default value */
-                sa_assert(!alias);
                 alias = g_strdup(opt->help);
                 name = alias;
                 if ((value = strchr(name, '='))) {