From nobody Sun Feb 8 17:37:33 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=1637768703; cv=none; d=zohomail.com; s=zohoarc; b=e4YUULZiyDLNCn0rFiRQFAzVjyYLVju1j/NEKa8J9Vix4ym502Flm36HTi2oGvdY/nXPYjfc4a1ldEfku7ml8rZL2ZvhgtD4CtVS51kpy8DW9vL+c+PH2OlzTNg8/flDIu70AVOt+6RMDD34D7Tst2BS7s6P30Hw9JpO6chABto= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1637768703; 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=7RSckSr0HRFLS40t0485VKwI3axUhvxpGevW0hMB3H8=; b=PKXfPzRsQJ8h8LbiaqniC1PPAgSgpTncE1lZoG9N2qmcDSUbrQeyVFMtP+Or/17JbpAzOfXag+E6I+UboefPIUOlY9GAL+RWcX9De7Ev53Wm8LIb7EUDYQDv1jroGqjoAHKHUldFO7z7BzML6fxnkWzbmwwnYXGA17ywhjstZEA= 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 1637768703307457.07541836951236; Wed, 24 Nov 2021 07:45:03 -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-221-FQxvT6slOSCan1ofIpo3jA-1; Wed, 24 Nov 2021 10:44:58 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2C69581EE6C; Wed, 24 Nov 2021 15:44:48 +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 0EB5710246E8; Wed, 24 Nov 2021 15:44:48 +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 D3D071809CB7; Wed, 24 Nov 2021 15:44:47 +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 1AOFiUgA027902 for ; Wed, 24 Nov 2021 10:44:30 -0500 Received: by smtp.corp.redhat.com (Postfix) id B600079454; Wed, 24 Nov 2021 15:44:30 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.33.36.199]) by smtp.corp.redhat.com (Postfix) with ESMTP id 250B07945A; Wed, 24 Nov 2021 15:44:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1637768702; 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=7RSckSr0HRFLS40t0485VKwI3axUhvxpGevW0hMB3H8=; b=UfeRnRf+4H7kpnWhXBRJlTs7BwudsxzDeLSMFVbtHxKjH3ddTMjlOBKCzhyXt4pqYeU5EE Ozea1zFBN2TharYAGrPVZjg4CJM12dZdVhdm+uE+2cZUxgb+bpuWbk4zweLcqjChjayUS1 7eM2XtcPUFmHfqgdN9Tm0UbIl4n84nk= X-MC-Unique: FQxvT6slOSCan1ofIpo3jA-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Subject: [libvirt PATCH v2 04/12] util: replace TPM global variables with a struct array Date: Wed, 24 Nov 2021 15:44:08 +0000 Message-Id: <20211124154416.369770-5-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.84 on 10.5.11.22 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: 1637768705081100001 The virTPMEmulatorInit function defines a struct that gets filled with pointers to global variables. It will be simpler to just use the struct for the global variables directly. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: J=C3=A1n Tomko --- src/util/virtpm.c | 121 ++++++++++++++++++++++------------------------ 1 file changed, 58 insertions(+), 63 deletions(-) diff --git a/src/util/virtpm.c b/src/util/virtpm.c index cc9173cecd..2539ea9275 100644 --- a/src/util/virtpm.c +++ b/src/util/virtpm.c @@ -96,29 +96,52 @@ virTPMCreateCancelPath(const char *devpath) * capabilities bitmap */ static virMutex swtpm_tools_lock =3D VIR_MUTEX_INITIALIZER; -static char *swtpm_path; -static struct stat swtpm_stat; -static virBitmap *swtpm_caps; - -static char *swtpm_setup_path; -static struct stat swtpm_setup_stat; -static virBitmap *swtpm_setup_caps; - -static char *swtpm_ioctl_path; -static struct stat swtpm_ioctl_stat; =20 typedef int (*virTPMBinaryCapsParse)(const char *); =20 +typedef enum _virTPMBinary { + VIR_TPM_BINARY_SWTPM, + VIR_TPM_BINARY_SWTPM_SETUP, + VIR_TPM_BINARY_SWTPM_IOCTL, + + VIR_TPM_BINARY_LAST +} virTPMBinary; + +VIR_ENUM_DECL(virTPMBinary); +VIR_ENUM_IMPL(virTPMBinary, + VIR_TPM_BINARY_LAST, + "swtpm", "swtpm_setup", "swtpm_ioctl"); + +typedef struct _virTPMBinaryInfo { + char *path; + struct stat stat; + const char *parm; + virBitmap *caps; + virTPMBinaryCapsParse capsParse; +} virTPMBinaryInfo; + +static virTPMBinaryInfo swtpmBinaries[VIR_TPM_BINARY_LAST] =3D { + [VIR_TPM_BINARY_SWTPM] =3D { + .parm =3D "socket", + .capsParse =3D virTPMSwtpmFeatureTypeFromString, + }, + [VIR_TPM_BINARY_SWTPM_SETUP] =3D { + .capsParse =3D virTPMSwtpmSetupFeatureTypeFromString, + }, + [VIR_TPM_BINARY_SWTPM_IOCTL] =3D { + }, +}; + static char * -virTPMBinaryGetPath(char **path_var) +virTPMBinaryGetPath(virTPMBinary binary) { char *s; =20 - if (!*path_var && virTPMEmulatorInit() < 0) + if (!swtpmBinaries[binary].path && virTPMEmulatorInit() < 0) return NULL; =20 virMutexLock(&swtpm_tools_lock); - s =3D g_strdup(*path_var); + s =3D g_strdup(swtpmBinaries[binary].path); virMutexUnlock(&swtpm_tools_lock); =20 return s; @@ -127,19 +150,19 @@ virTPMBinaryGetPath(char **path_var) char * virTPMGetSwtpm(void) { - return virTPMBinaryGetPath(&swtpm_path); + return virTPMBinaryGetPath(VIR_TPM_BINARY_SWTPM); } =20 char * virTPMGetSwtpmSetup(void) { - return virTPMBinaryGetPath(&swtpm_setup_path); + return virTPMBinaryGetPath(VIR_TPM_BINARY_SWTPM_SETUP); } =20 char * virTPMGetSwtpmIoctl(void) { - return virTPMBinaryGetPath(&swtpm_ioctl_path); + return virTPMBinaryGetPath(VIR_TPM_BINARY_SWTPM_IOCTL); } =20 /* virTPMExecGetCaps @@ -245,62 +268,33 @@ int virTPMEmulatorInit(void) { int ret =3D -1; - static const struct { - const char *name; - char **path; - struct stat *stat; - const char *parm; - virBitmap **caps; - virTPMBinaryCapsParse capsParse; - } prgs[] =3D { - { - .name =3D "swtpm", - .path =3D &swtpm_path, - .stat =3D &swtpm_stat, - .parm =3D "socket", - .caps =3D &swtpm_caps, - .capsParse =3D virTPMSwtpmFeatureTypeFromString, - }, - { - .name =3D "swtpm_setup", - .path =3D &swtpm_setup_path, - .stat =3D &swtpm_setup_stat, - .caps =3D &swtpm_setup_caps, - .capsParse =3D virTPMSwtpmSetupFeatureTypeFromString, - }, - { - .name =3D "swtpm_ioctl", - .path =3D &swtpm_ioctl_path, - .stat =3D &swtpm_ioctl_stat, - } - }; size_t i; =20 virMutexLock(&swtpm_tools_lock); =20 - for (i =3D 0; i < G_N_ELEMENTS(prgs); i++) { + for (i =3D 0; i < VIR_TPM_BINARY_LAST; i++) { g_autofree char *path =3D NULL; - bool findit =3D *prgs[i].path =3D=3D NULL; + bool findit =3D swtpmBinaries[i].path =3D=3D NULL; struct stat statbuf; =20 if (!findit) { /* has executables changed? */ - if (stat(*prgs[i].path, &statbuf) < 0) + if (stat(swtpmBinaries[i].path, &statbuf) < 0) findit =3D true; =20 if (!findit && - statbuf.st_mtime !=3D prgs[i].stat->st_mtime) + statbuf.st_mtime !=3D swtpmBinaries[i].stat.st_mtime) findit =3D true; } =20 if (findit) { - VIR_FREE(*prgs[i].path); + VIR_FREE(swtpmBinaries[i].path); =20 - path =3D virFindFileInPath(prgs[i].name); + path =3D virFindFileInPath(virTPMBinaryTypeToString(i)); if (!path) { virReportSystemError(ENOENT, - _("Unable to find '%s' binary in $PATH"), - prgs[i].name); + _("Unable to find '%s' binary in $PAT= H"), + virTPMBinaryTypeToString(i)); goto cleanup; } if (!virFileIsExecutable(path)) { @@ -309,17 +303,18 @@ virTPMEmulatorInit(void) path); goto cleanup; } - if (stat(path, prgs[i].stat) < 0) { + if (stat(path, &swtpmBinaries[i].stat) < 0) { virReportSystemError(errno, _("Could not stat %s"), path); goto cleanup; } - *prgs[i].path =3D g_steal_pointer(&path); + swtpmBinaries[i].path =3D g_steal_pointer(&path); =20 - if (prgs[i].caps) { - *prgs[i].caps =3D virTPMGetCaps(prgs[i].capsParse, - *prgs[i].path, prgs[i].parm); - if (!*prgs[i].caps) + if (swtpmBinaries[i].capsParse) { + swtpmBinaries[i].caps =3D virTPMGetCaps(swtpmBinaries[i].c= apsParse, + swtpmBinaries[i].pat= h, + swtpmBinaries[i].par= m); + if (!swtpmBinaries[i].caps) goto cleanup; } } @@ -334,22 +329,22 @@ virTPMEmulatorInit(void) } =20 static bool -virTPMBinaryGetCaps(virBitmap **caps_var, +virTPMBinaryGetCaps(virTPMBinary binary, unsigned int cap) { if (virTPMEmulatorInit() < 0) return false; - return virBitmapIsBitSet(*caps_var, cap); + return virBitmapIsBitSet(swtpmBinaries[binary].caps, cap); } =20 bool virTPMSwtpmCapsGet(unsigned int cap) { - return virTPMBinaryGetCaps(&swtpm_caps, cap); + return virTPMBinaryGetCaps(VIR_TPM_BINARY_SWTPM, cap); } =20 bool virTPMSwtpmSetupCapsGet(unsigned int cap) { - return virTPMBinaryGetCaps(&swtpm_setup_caps, cap); + return virTPMBinaryGetCaps(VIR_TPM_BINARY_SWTPM_SETUP, cap); } --=20 2.33.1