From nobody Mon Feb 9 00:55:52 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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 170.10.129.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=1691059005; cv=none; d=zohomail.com; s=zohoarc; b=KfmKQvq3VHuWS8U1dNDQeXJDwod3PC66R9V1X14VjUFUOpiF1ntWIq9NmmbFjiZHKQznuJv5PJ1Lhso5UEsEICson+TBLIKBFNPZVgRPU3/+U7YA0bf5o0p3/4ZB9EAf9UOllym7pNEU4p7YhC9db5H77Zdsjiu1PPsYahq/n10= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1691059005; 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=0T4X4zGhGA0aFrWz5DgMSHLRbBXfoVcSiqJL2vKytdQ=; b=AAoyht1x+XIhD/GbGW2524Z8It7d9ZNKGsQJU548PJbNK+HgJeZ0AQX/yUOdSoz8O0wmt5y1jIfZkA7+Oh583NygV3Ak6Kl8oVevUT45wcxIola2FFr3mtiyvbDsJxYUFkn2RcvHR4GpYsvHP830AB/yNDzQB91/aydlXWoAJWw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1691059005813697.8341049456044; Thu, 3 Aug 2023 03:36:45 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-605-7aRBWB6QN2qjqplNDBTCNw-1; Thu, 03 Aug 2023 06:36:42 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 249E388D2AD; Thu, 3 Aug 2023 10:36:40 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0F6FA200BA76; Thu, 3 Aug 2023 10:36:40 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 139B91947229; Thu, 3 Aug 2023 10:36:37 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 5FAB019451E9 for ; Thu, 3 Aug 2023 10:36:30 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 425E9F77BD; Thu, 3 Aug 2023 10:36:30 +0000 (UTC) Received: from localhost.localdomain (unknown [10.43.2.36]) by smtp.corp.redhat.com (Postfix) with ESMTP id DD7CFF7FA6 for ; Thu, 3 Aug 2023 10:36:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1691059004; 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=0T4X4zGhGA0aFrWz5DgMSHLRbBXfoVcSiqJL2vKytdQ=; b=LpmFexqkmOOQEvoNvy2yPpSWsWYIuNH+pzu7FOWqf5KGDgYmbspKCR8zma6ITWrxm3WCOs YluJ5ZBUclcHrog/g0y2qgcjM5vRqppibz/GgmGhbN8FVobbgCQPfMJ6QSyZJgVATda9Xn 0LY9jW1IzurWlO70/81Q/pyUWhNG8aw= X-MC-Unique: 7aRBWB6QN2qjqplNDBTCNw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 12/13] lib: Finish using struct zero initializer manually Date: Thu, 3 Aug 2023 12:36:19 +0200 Message-ID: <19e606d61604640feb21c3ec306ddf565e7a0fed.1691058853.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1691059010819100015 Content-Type: text/plain; charset="utf-8"; x-default="true" There are some cases left after previous commit which were not picked up by coccinelle. Mostly, becuase the spatch was not generic enough. We are left with cases like: two variables declared on one line, a variable declared in #ifdef-s (there are notoriously difficult for coccinelle), arrays, macro definitions, etc. Finish what coccinelle started, by hand. Signed-off-by: Michal Privoznik Reviewed-by: Claudio Fontana --- src/libxl/libxl_capabilities.c | 4 +--- src/qemu/qemu_monitor.c | 4 +--- src/rpc/virnettlscontext.c | 3 +-- src/util/virnetlink.c | 4 +--- src/util/virutil.c | 4 ++-- src/vmx/vmx.c | 4 +--- tests/libxlmock.c | 4 +--- tests/qemumonitorjsontest.c | 5 ++--- tests/sockettest.c | 6 ++---- tools/nss/libvirt_nss.c | 7 +++---- tools/virsh-domain.c | 11 ++++------- 11 files changed, 19 insertions(+), 37 deletions(-) diff --git a/src/libxl/libxl_capabilities.c b/src/libxl/libxl_capabilities.c index 5ee6fe3f67..177e8b988e 100644 --- a/src/libxl/libxl_capabilities.c +++ b/src/libxl/libxl_capabilities.c @@ -328,11 +328,9 @@ libxlCapsInitGuests(libxl_ctx *ctx, virCaps *caps) char *saveptr =3D NULL; size_t i; =20 - struct guest_arch guest_archs[32]; + struct guest_arch guest_archs[32] =3D { 0 }; int nr_guest_archs =3D 0; =20 - memset(guest_archs, 0, sizeof(guest_archs)); - if ((ver_info =3D libxl_get_version_info(ctx)) =3D=3D NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Failed to get version info from libxenlight")); diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index db34b6c179..02da1d6dfc 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -311,11 +311,9 @@ qemuMonitorIOWriteWithFD(qemuMonitor *mon, struct msghdr msg =3D { 0 }; struct iovec iov[1]; int ret; - char control[CMSG_SPACE(sizeof(int))]; + char control[CMSG_SPACE(sizeof(int))] =3D { 0 }; struct cmsghdr *cmsg; =20 - memset(control, 0, sizeof(control)); - iov[0].iov_base =3D (void *)data; iov[0].iov_len =3D len; =20 diff --git a/src/rpc/virnettlscontext.c b/src/rpc/virnettlscontext.c index f72597ee80..1939fe5d6e 100644 --- a/src/rpc/virnettlscontext.c +++ b/src/rpc/virnettlscontext.c @@ -545,12 +545,11 @@ static int virNetTLSContextSanityCheckCredentials(boo= l isServer, const char *certFile) { gnutls_x509_crt_t cert =3D NULL; - gnutls_x509_crt_t cacerts[MAX_CERTS]; + gnutls_x509_crt_t cacerts[MAX_CERTS] =3D { 0 }; size_t ncacerts =3D 0; size_t i; int ret =3D -1; =20 - memset(cacerts, 0, sizeof(cacerts)); if ((access(certFile, R_OK) =3D=3D 0) && !(cert =3D virNetTLSContextLoadCertFromFile(certFile, isServer))) goto cleanup; diff --git a/src/util/virnetlink.c b/src/util/virnetlink.c index d964c439b4..2d052cd03e 100644 --- a/src/util/virnetlink.c +++ b/src/util/virnetlink.c @@ -250,7 +250,7 @@ virNetlinkSendRequest(struct nl_msg *nl_msg, uint32_t s= rc_pid, int fd; int n; virNetlinkHandle *nlhandle =3D NULL; - struct pollfd fds[1]; + struct pollfd fds[1] =3D { 0 }; struct nlmsghdr *nlmsg =3D nlmsg_hdr(nl_msg); =20 if (protocol >=3D MAX_LINKS) { @@ -286,8 +286,6 @@ virNetlinkSendRequest(struct nl_msg *nl_msg, uint32_t s= rc_pid, goto error; } =20 - memset(fds, 0, sizeof(fds)); - fds[0].fd =3D fd; fds[0].events =3D POLLIN; =20 diff --git a/src/util/virutil.c b/src/util/virutil.c index 40ca205595..b5b65fb415 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -428,7 +428,8 @@ virGetHostnameImpl(bool quiet) { int r; char hostname[HOST_NAME_MAX+1], *result =3D NULL; - struct addrinfo hints, *info; + struct addrinfo hints =3D { 0 }; + struct addrinfo *info; =20 r =3D gethostname(hostname, sizeof(hostname)); if (r =3D=3D -1) { @@ -453,7 +454,6 @@ virGetHostnameImpl(bool quiet) * canonicalize the hostname by running it through getaddrinfo */ =20 - memset(&hints, 0, sizeof(hints)); hints.ai_flags =3D AI_CANONNAME|AI_CANONIDN; hints.ai_family =3D AF_UNSPEC; r =3D getaddrinfo(hostname, NULL, &hints, &info); diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index fe4f253e9e..5c6925be22 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -3229,7 +3229,7 @@ virVMXFormatConfig(virVMXContext *ctx, virDomainXMLOp= tion *xmlopt, virDomainDef char *vmx =3D NULL; size_t i; int sched_cpu_affinity_length; - unsigned char zero[VIR_UUID_BUFLEN]; + unsigned char zero[VIR_UUID_BUFLEN] =3D { 0 }; g_auto(virBuffer) buffer =3D VIR_BUFFER_INITIALIZER; char *preliminaryDisplayName =3D NULL; char *displayName =3D NULL; @@ -3247,8 +3247,6 @@ virVMXFormatConfig(virVMXContext *ctx, virDomainXMLOp= tion *xmlopt, virDomainDef return NULL; } =20 - memset(zero, 0, VIR_UUID_BUFLEN); - if (def->virtType !=3D VIR_DOMAIN_VIRT_VMWARE) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Expecting virt type to be '%1$s' but found '%2$s= '"), diff --git a/tests/libxlmock.c b/tests/libxlmock.c index 205d34df19..f564a0ef72 100644 --- a/tests/libxlmock.c +++ b/tests/libxlmock.c @@ -60,9 +60,7 @@ VIR_MOCK_IMPL_RET_ARGS(libxl_get_version_info, const libxl_version_info*, libxl_ctx *, ctx) { - static libxl_version_info info; - - memset(&info, 0, sizeof(info)); + static libxl_version_info info =3D { 0 }; =20 /* silence gcc warning about unused function */ if (0) diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c index a1740d3f45..2e7b661db4 100644 --- a/tests/qemumonitorjsontest.c +++ b/tests/qemumonitorjsontest.c @@ -1591,15 +1591,14 @@ testQemuMonitorJSONqemuMonitorJSONGetMigrationStats= (const void *opaque) { const testGenericData *data =3D opaque; virDomainXMLOption *xmlopt =3D data->xmlopt; - qemuMonitorMigrationStats stats, expectedStats; + qemuMonitorMigrationStats stats; + qemuMonitorMigrationStats expectedStats =3D { 0 }; g_autofree char *error =3D NULL; g_autoptr(qemuMonitorTest) test =3D NULL; =20 if (!(test =3D qemuMonitorTestNewSchema(xmlopt, data->schema))) return -1; =20 - memset(&expectedStats, 0, sizeof(expectedStats)); - expectedStats.status =3D QEMU_MONITOR_MIGRATION_STATUS_ACTIVE; expectedStats.total_time =3D 47; expectedStats.ram_total =3D 1611038720; diff --git a/tests/sockettest.c b/tests/sockettest.c index 6b9063e11d..5cb8a9fb72 100644 --- a/tests/sockettest.c +++ b/tests/sockettest.c @@ -269,10 +269,9 @@ mymain(void) =20 #define DO_TEST_PARSE_AND_FORMAT(addrstr, family, pass) \ do { \ - virSocketAddr addr; \ + virSocketAddr addr =3D { 0 }; \ struct testParseData data =3D { &addr, addrstr, family, pass }; \ struct testFormatData data2 =3D { &addr, addrstr, pass }; \ - memset(&addr, 0, sizeof(addr)); \ if (virTestRun("Test parse " addrstr " family " #family, \ testParseHelper, &data) < 0) \ ret =3D -1; \ @@ -283,10 +282,9 @@ mymain(void) =20 #define DO_TEST_PARSE_AND_CHECK_FORMAT(addrstr, addrformated, family, pass= ) \ do { \ - virSocketAddr addr; \ + virSocketAddr addr =3D { 0 }; \ struct testParseData data =3D { &addr, addrstr, family, true}; \ struct testFormatData data2 =3D { &addr, addrformated, pass }; \ - memset(&addr, 0, sizeof(addr)); \ if (virTestRun("Test parse " addrstr " family " #family, \ testParseHelper, &data) < 0) \ ret =3D -1; \ diff --git a/tools/nss/libvirt_nss.c b/tools/nss/libvirt_nss.c index ec14ac804b..5c4796e8bc 100644 --- a/tools/nss/libvirt_nss.c +++ b/tools/nss/libvirt_nss.c @@ -538,15 +538,14 @@ _nss_compat_getaddrinfo(void *retval, void *mdata __attribute__((unused)), va_list ap) { - struct addrinfo sentinel, *cur, *ai; + struct addrinfo sentinel =3D { 0 }; + struct addrinfo *cur =3D & sentinel; + struct addrinfo *ai; const char *name; =20 name =3D va_arg(ap, char *); ai =3D va_arg(ap, struct addrinfo *); =20 - memset(&sentinel, 0, sizeof(sentinel)); - cur =3D &sentinel; - if ((ai->ai_family =3D=3D AF_UNSPEC) || (ai->ai_family =3D=3D AF_INET6= )) aiforaf(name, AF_INET6, ai, &cur); if ((ai->ai_family =3D=3D AF_UNSPEC) || (ai->ai_family =3D=3D AF_INET)) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 7d76055eda..f8758f18a3 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -942,7 +942,8 @@ cmdAttachInterface(vshControl *ctl, const vshCmd *cmd) *inboundStr =3D NULL, *outboundStr =3D NULL, *alias =3D NUL= L; const char *sourceModeStr =3D NULL; int sourceMode =3D -1; - virNetDevBandwidthRate inbound, outbound; + virNetDevBandwidthRate inbound =3D { 0 }; + virNetDevBandwidthRate outbound =3D { 0 }; virDomainNetType typ; int ret; g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; @@ -990,7 +991,6 @@ cmdAttachInterface(vshControl *ctl, const vshCmd *cmd) } =20 if (inboundStr) { - memset(&inbound, 0, sizeof(inbound)); if (virshParseRateStr(ctl, inboundStr, &inbound) < 0) return false; if (!inbound.average && !inbound.floor) { @@ -999,7 +999,6 @@ cmdAttachInterface(vshControl *ctl, const vshCmd *cmd) } } if (outboundStr) { - memset(&outbound, 0, sizeof(outbound)); if (virshParseRateStr(ctl, outboundStr, &outbound) < 0) return false; if (outbound.average =3D=3D 0) { @@ -3286,7 +3285,8 @@ cmdDomIftune(vshControl *ctl, const vshCmd *cmd) bool current =3D vshCommandOptBool(cmd, "current"); bool config =3D vshCommandOptBool(cmd, "config"); bool live =3D vshCommandOptBool(cmd, "live"); - virNetDevBandwidthRate inbound, outbound; + virNetDevBandwidthRate inbound =3D { 0 }; + virNetDevBandwidthRate outbound =3D { 0 }; size_t i; =20 VSH_EXCLUSIVE_OPTIONS_VAR(current, live); @@ -3307,9 +3307,6 @@ cmdDomIftune(vshControl *ctl, const vshCmd *cmd) vshCommandOptStringReq(ctl, cmd, "outbound", &outboundStr) < 0) goto cleanup; =20 - memset(&inbound, 0, sizeof(inbound)); - memset(&outbound, 0, sizeof(outbound)); - if (inboundStr) { if (virshParseRateStr(ctl, inboundStr, &inbound) < 0) goto cleanup; --=20 2.41.0