From nobody Mon Feb 9 03:14:46 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.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 216.205.24.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=1621506793; cv=none; d=zohomail.com; s=zohoarc; b=BhKcPi7nuK/zpkF6EN+tUFd+KNblAyGk2o09VUVOMByHfGzirjThyB618so788ROnT8yx99Ob9tWqxvpUSa94o6Qoei8Ui4sGGapPnY0nCBGyGhe2ETN+RaY3JfrKjpQItfxKuvukQXh50BqP7h2bZiYXdL6rKIl3oCCLvcVWZ0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621506793; 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=Mnvu9UqZEt0WeAViAbPyZYmcTQriQG8eXjxhJQtduh8=; b=N0dPDT2YtdYZmSrtDOV0TU9wepOAqmzLttHH6BG6V0vW1zqm7eJ/fWhdJlmnlp5+QqKMngoYR9+lUzI4lp2bGG/ZHZeuNQEmFoOWYmfMNNxlUJa00pjVAsowu0sX4CsHLH1Fb58OygG8RSbB4Bi5tRvJO0fbZ6Wz6ffrd0pcjck= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1621506793519428.86326551635716; Thu, 20 May 2021 03:33:13 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-259-g1_J3QJqOcWPX_advimGjw-1; Thu, 20 May 2021 06:33:09 -0400 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 C44931854E29; Thu, 20 May 2021 10:33:03 +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 9F7845D75A; Thu, 20 May 2021 10:33:03 +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 CBAB5180B463; Thu, 20 May 2021 10:33:02 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 14KARENX019604 for ; Thu, 20 May 2021 06:27:14 -0400 Received: by smtp.corp.redhat.com (Postfix) id E1EE310027C4; Thu, 20 May 2021 10:27:14 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.61]) by smtp.corp.redhat.com (Postfix) with ESMTP id 539791009962 for ; Thu, 20 May 2021 10:26:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1621506792; 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=Mnvu9UqZEt0WeAViAbPyZYmcTQriQG8eXjxhJQtduh8=; b=OO8ypJx8cP5uh1qx8ImKzB6mW/Wx5JscbhVLv6X6aG/0PnZAUnzMNVbojQHOtCrH1II9G0 2iuMuOAS4x+/2iXGoa8vjjSPAwbOCYtQdQuDkkb+E30M5P7/gF0H5JO7/TGoZ4XFRsJxhO rb5jR6RxzvBT3vBeORvgWhloieeI/B4= X-MC-Unique: g1_J3QJqOcWPX_advimGjw-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 2/2] Remove static analysis assertions Date: Thu, 20 May 2021 12:26:24 +0200 Message-Id: <6d1b9ac1dbcc2dd50a3030917ebe5ccdc92eab6d.1621506221.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 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-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" 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 --- src/conf/virdomainobjlist.c | 2 -- src/conf/virnwfilterbindingobjlist.c | 1 - src/libxl/libxl_driver.c | 9 --------- src/qemu/qemu_monitor.c | 3 --- src/qemu/qemu_process.c | 1 - src/rpc/virnetserver.c | 4 ---- src/util/vircommand.c | 3 --- src/util/virconf.c | 6 ------ src/util/virhostmem.c | 2 -- src/util/virobject.c | 1 - src/util/virutil.c | 3 --- tests/commandtest.c | 1 - tools/vsh.c | 1 - 13 files changed, 37 deletions(-) diff --git a/src/conf/virdomainobjlist.c b/src/conf/virdomainobjlist.c index e1d455eefe..5f9fd9aabc 100644 --- a/src/conf/virdomainobjlist.c +++ b/src/conf/virdomainobjlist.c @@ -980,7 +980,6 @@ virDomainObjListCollect(virDomainObjList *domlist, struct virDomainListData data =3D { NULL, 0 }; virObjectRWLockRead(domlist); - sa_assert(domlist->objs); data.vms =3D 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/virnwfilterbin= dingobjlist.c index fe97f2b3df..1f19e27eb0 100644 --- a/src/conf/virnwfilterbindingobjlist.c +++ b/src/conf/virnwfilterbindingobjlist.c @@ -432,7 +432,6 @@ virNWFilterBindingObjListCollect(virNWFilterBindingObjL= ist *domlist, struct virNWFilterBindingListData data =3D { NULL, 0 }; virObjectRWLockRead(domlist); - sa_assert(domlist->objs); data.bindings =3D 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 d54cd41785..7b89e7c224 100644 --- 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 =3D newmem; @@ -1702,7 +1700,6 @@ libxlDomainSetMemoryFlags(virDomainPtr dom, unsigned = long newmem, } if (flags & VIR_DOMAIN_MEM_CONFIG) { - sa_assert(persistentDef); persistentDef->mem.cur_balloon =3D newmem; ret =3D virDomainDefSave(persistentDef, driver->xmlopt, cfg->c= onfigDir); goto endjob; @@ -2476,9 +2473,6 @@ libxlDomainPinVcpuFlags(virDomainPtr dom, unsigned in= t vcpu, if (flags & VIR_DOMAIN_AFFECT_LIVE) targetDef =3D vm->def; - /* Make sure coverity knows targetDef is valid at this point. */ - sa_assert(targetDef); - pcpumap =3D virBitmapNewData(cpumap, maplen); if (!pcpumap) goto endjob; @@ -2557,9 +2551,6 @@ libxlDomainGetVcpuPinInfo(virDomainPtr dom, int ncpum= aps, if (flags & VIR_DOMAIN_AFFECT_LIVE) targetDef =3D vm->def; - /* Make sure coverity knows targetDef is valid at this point. */ - sa_assert(targetDef); - hostcpus =3D virBitmapNew(libxl_get_max_cpus(cfg->ctx)); virBitmapSetAll(hostcpus); diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 1e6f892e08..8f35b4240f 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -398,9 +398,6 @@ qemuMonitorIOWriteWithFD(qemuMonitor *mon, msg.msg_controllen =3D sizeof(control); cmsg =3D 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 =3D CMSG_LEN(sizeof(int)); cmsg->cmsg_level =3D SOL_SOCKET; cmsg->cmsg_type =3D SCM_RIGHTS; diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index cf422656ff..a5f3114380 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -2089,7 +2089,6 @@ qemuProcessReadLog(qemuDomainLogContext *logCtxt, *eol =3D '\n'; } } - filter_next =3D NULL; /* silence false coverity warning */ if (got > 0 && buf[got - 1] =3D=3D '\n') { diff --git a/src/rpc/virnetserver.c b/src/rpc/virnetserver.c index 42e06fcb59..cfb65f8b5f 100644 --- a/src/rpc/virnetserver.c +++ b/src/rpc/virnetserver.c @@ -937,10 +937,6 @@ virNetServerProcessClients(virNetServer *srv) reprocess: for (i =3D 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 =3D srv->clients[i]; virObjectLock(client); if (virNetServerClientWantCloseLocked(client)) diff --git a/src/util/vircommand.c b/src/util/vircommand.c index 7abb2e288f..6e01e4cb62 100644 --- a/src/util/vircommand.c +++ b/src/util/vircommand.c @@ -2263,9 +2263,6 @@ virCommandProcessIO(virCommand *cmd) buf =3D cmd->errbuf; len =3D &errlen; } - /* Silence a false positive from clang. */ - sa_assert(buf); - done =3D read(fds[i].fd, data, sizeof(data)); if (done < 0) { if (errno !=3D EINTR && diff --git a/src/util/virconf.c b/src/util/virconf.c index 15a65ec394..07ecfc7b57 100644 --- a/src/util/virconf.c +++ b/src/util/virconf.c @@ -472,12 +472,6 @@ virConfParseValue(virConfParserCtxt *ctxt) } while ((ctxt->cur < ctxt->end) && (CUR !=3D ']')) { - /* 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 =3D lst; while (prev->next..." below. */ - sa_assert(lst); - if (CUR !=3D ',') { virConfError(ctxt, VIR_ERR_CONF_SYNTAX, _("expecting a separator in list")); diff --git a/src/util/virhostmem.c b/src/util/virhostmem.c index ae42978ed2..8aa675cb4f 100644 --- a/src/util/virhostmem.c +++ b/src/util/virhostmem.c @@ -313,7 +313,6 @@ virHostMemSetParameterValue(virTypedParameterPtr param) int rc =3D -1; char *field =3D strchr(param->field, '_'); - sa_assert(field); field++; path =3D g_strdup_printf("%s/%s", SYSFS_MEMORY_SHARED_PATH, field); @@ -338,7 +337,6 @@ virHostMemParametersAreAllSupported(virTypedParameterPt= r params, virTypedParameterPtr param =3D ¶ms[i]; char *field =3D strchr(param->field, '_'); - sa_assert(field); field++; path =3D g_strdup_printf("%s/%s", SYSFS_MEMORY_SHARED_PATH, field); diff --git a/src/util/virobject.c b/src/util/virobject.c index 7173b9136f..3412985b79 100644 --- a/src/util/virobject.c +++ b/src/util/virobject.c @@ -182,7 +182,6 @@ virClassNew(virClass *parent, return NULL; } else if (objectSize <=3D parentSize || parentSize !=3D (parent ? parent->objectSize : 0)) { - sa_assert(parent); virReportInvalidArg(objectSize, _("object size %zu of %s is not larger than pa= rent class %zu"), objectSize, name, parent->objectSize); diff --git a/src/util/virutil.c b/src/util/virutil.c index 3f49a469e5..311cbbf93a 100644 --- 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 =3D=3D 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 57c7db67d8..5267e1bf1c 100644 --- 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 ebaf17f326..123284c636 100644 --- a/tools/vsh.c +++ b/tools/vsh.c @@ -449,7 +449,6 @@ vshCmddefGetOption(vshControl *ctl, const vshCmdDef *cm= d, const char *name, opt->help =3D "string": straight replacement of name opt->help =3D "string=3Dvalue": treat boolean flag as alias of option and its default value */ - sa_assert(!alias); alias =3D g_strdup(opt->help); name =3D alias; if ((value =3D strchr(name, '=3D'))) { --=20 2.31.1