From nobody Sun Feb 8 09:30:50 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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.133.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=1637768682; cv=none; d=zohomail.com; s=zohoarc; b=IjuzRLG6X/z4uG1CGDiP92IXsLyey/RMftc5pyxR4FamtMSu9JnwNVE43pWgeoGhcm5xXAKkJDo9W+jdm/WkyduFHagA130mAWNwHEV06uFRKIWsWeo2qMZUzkrJBlItqfY7PoDOeKPwcoEv4vVwobLuOdNJXctyo1dfzCeYIaY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1637768682; 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=JwO88BBICkFYKynQLV/NsKqgsQApFHv75oHZ87RZMb8=; b=cEWSFvaekGGPIffudGN3df0KTyx3OLeoP6IMDJIOT9F2MVNhq9dr80vV0CyEmx4YMD7iBRmaJzmJ+OtWyukmwIN1Cs01wHyW/OAGV02yfswE06qJclxaKKYZuLDg2xrmahyQ4lH4ZPexZGjQQe4VOD1OlWMkp0B/Oum+yVokCf0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.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.133.124]) by mx.zohomail.com with SMTPS id 1637768682548638.7622280599866; Wed, 24 Nov 2021 07:44:42 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-36-f3EoHP0TNvSun6lAv9h_3A-1; Wed, 24 Nov 2021 10:44:37 -0500 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 9D528100D682; Wed, 24 Nov 2021 15:44:32 +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 11FD65D6B1; Wed, 24 Nov 2021 15:44:32 +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 EDE521809C89; Wed, 24 Nov 2021 15:44:29 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 1AOFiSo9027876 for ; Wed, 24 Nov 2021 10:44:28 -0500 Received: by smtp.corp.redhat.com (Postfix) id 1685879455; Wed, 24 Nov 2021 15:44:28 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.33.36.199]) by smtp.corp.redhat.com (Postfix) with ESMTP id 79C3C79454; Wed, 24 Nov 2021 15:44:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1637768681; 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=JwO88BBICkFYKynQLV/NsKqgsQApFHv75oHZ87RZMb8=; b=UZ7CI4uuJI86RswJIinP+9gJ0SCQk+44XouMhYU2U8uCTHa9P6L1VHP0iKFEl71B/ZWIxY OXwFq8iMz8VivgiVv/exJbmdSsIpRNUoa0DuTBUc550fIWsrRVOr/zdnhGgEMexlNUY1Rw z7yLX25CloXtqeYElSaIMDX0yzxhcbQ= X-MC-Unique: f3EoHP0TNvSun6lAv9h_3A-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Subject: [libvirt PATCH v2 01/12] util: use consistent naming for swtpm global variables Date: Wed, 24 Nov 2021 15:44:05 +0000 Message-Id: <20211124154416.369770-2-berrange@redhat.com> In-Reply-To: <20211124154416.369770-1-berrange@redhat.com> References: <20211124154416.369770-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 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-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1637768683757100002 Use a '_path' suffix on all vars which are paths. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: J=C3=A1n Tomko --- src/util/virtpm.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/util/virtpm.c b/src/util/virtpm.c index 2c0dd707b0..d5d80aa9dc 100644 --- a/src/util/virtpm.c +++ b/src/util/virtpm.c @@ -100,11 +100,11 @@ static char *swtpm_path; static struct stat swtpm_stat; static virBitmap *swtpm_caps; =20 -static char *swtpm_setup; +static char *swtpm_setup_path; static struct stat swtpm_setup_stat; static virBitmap *swtpm_setup_caps; =20 -static char *swtpm_ioctl; +static char *swtpm_ioctl_path; static struct stat swtpm_ioctl_stat; =20 typedef int (*TypeFromStringFn)(const char *); @@ -129,11 +129,11 @@ virTPMGetSwtpmSetup(void) { char *s; =20 - if (!swtpm_setup && virTPMEmulatorInit() < 0) + if (!swtpm_setup_path && virTPMEmulatorInit() < 0) return NULL; =20 virMutexLock(&swtpm_tools_lock); - s =3D g_strdup(swtpm_setup); + s =3D g_strdup(swtpm_setup_path); virMutexUnlock(&swtpm_tools_lock); =20 return s; @@ -144,11 +144,11 @@ virTPMGetSwtpmIoctl(void) { char *s; =20 - if (!swtpm_ioctl && virTPMEmulatorInit() < 0) + if (!swtpm_ioctl_path && virTPMEmulatorInit() < 0) return NULL; =20 virMutexLock(&swtpm_tools_lock); - s =3D g_strdup(swtpm_ioctl); + s =3D g_strdup(swtpm_ioctl_path); virMutexUnlock(&swtpm_tools_lock); =20 return s; @@ -275,14 +275,14 @@ virTPMEmulatorInit(void) }, { .name =3D "swtpm_setup", - .path =3D &swtpm_setup, + .path =3D &swtpm_setup_path, .stat =3D &swtpm_setup_stat, .caps =3D &swtpm_setup_caps, .typeFromStringFn =3D virTPMSwtpmSetupFeatureTypeFromString, }, { .name =3D "swtpm_ioctl", - .path =3D &swtpm_ioctl, + .path =3D &swtpm_ioctl_path, .stat =3D &swtpm_ioctl_stat, } }; --=20 2.33.1