From nobody Mon Feb 9 00:06:55 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=1652108559; cv=none; d=zohomail.com; s=zohoarc; b=AWAYBlJEPP67nHzp9GQptQmNd/bOIN1GjXKw+5jf0dT51XBtPpF6IbeaRopvs1CA58LKACvHSG23zBwHGvhfEFVnik9KLHMPLhmR+h+JkNwvpoZAqGkqAGTZUkN159BOwhuFNaflwS/GllAEu2lsfOmugmp8rX6+Psn4AgbAlXk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1652108559; 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=GWfH+BFKNpF/Sr0fUd0EQqUdoeY3uBYRMOLdZG4p7Xg=; b=VC3MabGZ3MSK0FhVtsGOToumyfIOVEPBIZ5iX0n3XR+Q40PIq+9ARqf0xjGbufZ5aML835Re7bNjGrEu2pCJUzkZ0wP3fIt5GJyvX9SsDp3eDdTYACo+rYDtUFwKja0qYTCVq6gHLnt1IO1AzVQ/ckUEh5D/tcARaZQpHo7Mqus= 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 1652108559128212.3098967407701; Mon, 9 May 2022 08:02:39 -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-417-CoKSaiNsPt29RX7Yc4ZHrQ-1; Mon, 09 May 2022 11:02:34 -0400 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 8315D80CC59; Mon, 9 May 2022 15:02:27 +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 E8DF0416141; Mon, 9 May 2022 15:02:26 +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 6AAAE1947077; Mon, 9 May 2022 15:02:25 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 3E59A1947040 for ; Mon, 9 May 2022 15:02:23 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 30A371121315; Mon, 9 May 2022 15:02:23 +0000 (UTC) Received: from maggie.redhat.com (unknown [10.43.2.180]) by smtp.corp.redhat.com (Postfix) with ESMTP id CC56A1121330 for ; Mon, 9 May 2022 15:02:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1652108558; 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=GWfH+BFKNpF/Sr0fUd0EQqUdoeY3uBYRMOLdZG4p7Xg=; b=XFe/4A29+ETfWQfG3MJ9sgwBlUEy0+yCc55L2TV6kdzdgYftxMg1VOgZWWUfDApVvJR6T/ O3ldVem1wfLAU55yPj+7JTboglenuX05zqZYakz4YU7caGrlS+SeFfQjdVXVzJ8O3rogY+ GxVSk5URVNeIdxoIQ3WoxcWXInSMd9o= X-MC-Unique: CoKSaiNsPt29RX7Yc4ZHrQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH RFC 01/10] qemu_tpm: Make APIs work over a single virDomainTPMDef Date: Mon, 9 May 2022 17:02:08 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 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 2.85 on 10.11.54.10 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) X-ZM-MESSAGEID: 1652108560987100001 Content-Type: text/plain; charset="utf-8"; x-default="true" In qemu_extdevice.c lives code that handles helper daemons that are required for some types of devices (e.g. virtiofsd, vhost-user-gpu, swtpm, etc.). These devices have their own handling code in separate files, with only a very basic functions exposed (e.g. for starting/stopping helper process, placing it into given CGroup, etc.). And these functions all work over a single instance of device (virDomainVideoDef *, virDomainFSDef *, etc.), except for TPM handling code which takes virDomainDef * and iterates over it inside its module. Remove this oddness and make qemuExtTPM*() functions look closer to the rest of the code. Signed-off-by: Michal Privoznik Reviewed-by: Daniel P. Berrang=C3=A9 --- src/qemu/qemu_extdevice.c | 51 ++++++++++++++++------ src/qemu/qemu_tpm.c | 89 +++++++++++---------------------------- src/qemu/qemu_tpm.h | 11 +++-- 3 files changed, 69 insertions(+), 82 deletions(-) diff --git a/src/qemu/qemu_extdevice.c b/src/qemu/qemu_extdevice.c index 537b130394..234815c075 100644 --- a/src/qemu/qemu_extdevice.c +++ b/src/qemu/qemu_extdevice.c @@ -73,8 +73,15 @@ static int qemuExtDevicesInitPaths(virQEMUDriver *driver, virDomainDef *def) { - if (def->ntpms > 0) - return qemuExtTPMInitPaths(driver, def); + size_t i; + + for (i =3D 0; i < def->ntpms; i++) { + virDomainTPMDef *tpm =3D def->tpms[i]; + + if (tpm->type =3D=3D VIR_DOMAIN_TPM_TYPE_EMULATOR && + qemuExtTPMInitPaths(driver, def, tpm) < 0) + return -1; + } =20 return 0; } @@ -135,9 +142,13 @@ qemuExtDevicesPrepareHost(virQEMUDriver *driver, if (qemuExtDevicesInitPaths(driver, def) < 0) return -1; =20 - if (def->ntpms > 0 && - qemuExtTPMPrepareHost(driver, def) < 0) - return -1; + for (i =3D 0; i < def->ntpms; i++) { + virDomainTPMDef *tpm =3D def->tpms[i]; + + if (tpm->type =3D=3D VIR_DOMAIN_TPM_TYPE_EMULATOR && + qemuExtTPMPrepareHost(driver, def, tpm) < 0) + return -1; + } =20 for (i =3D 0; i < def->nnets; i++) { virDomainNetDef *net =3D def->nets[i]; @@ -155,11 +166,14 @@ void qemuExtDevicesCleanupHost(virQEMUDriver *driver, virDomainDef *def) { + size_t i; + if (qemuExtDevicesInitPaths(driver, def) < 0) return; =20 - if (def->ntpms > 0) - qemuExtTPMCleanupHost(def); + for (i =3D 0; i < def->ntpms; i++) { + qemuExtTPMCleanupHost(def->tpms[i]); + } } =20 =20 @@ -180,8 +194,13 @@ qemuExtDevicesStart(virQEMUDriver *driver, } } =20 - if (def->ntpms > 0 && qemuExtTPMStart(driver, vm, incomingMigration) <= 0) - return -1; + for (i =3D 0; i < def->ntpms; i++) { + virDomainTPMDef *tpm =3D def->tpms[i]; + + if (tpm->type =3D=3D VIR_DOMAIN_TPM_TYPE_EMULATOR && + qemuExtTPMStart(driver, vm, tpm, incomingMigration) < 0) + return -1; + } =20 for (i =3D 0; i < def->nnets; i++) { virDomainNetDef *net =3D def->nets[i]; @@ -222,8 +241,10 @@ qemuExtDevicesStop(virQEMUDriver *driver, qemuExtVhostUserGPUStop(driver, vm, video); } =20 - if (def->ntpms > 0) - qemuExtTPMStop(driver, vm); + for (i =3D 0; i < def->ntpms; i++) { + if (def->tpms[i]->type =3D=3D VIR_DOMAIN_TPM_TYPE_EMULATOR) + qemuExtTPMStop(driver, vm); + } =20 for (i =3D 0; i < def->nnets; i++) { virDomainNetDef *net =3D def->nets[i]; @@ -299,9 +320,11 @@ qemuExtDevicesSetupCgroup(virQEMUDriver *driver, return -1; } =20 - if (def->ntpms > 0 && - qemuExtTPMSetupCgroup(driver, def, cgroup) < 0) - return -1; + for (i =3D 0; i < def->ntpms; i++) { + if (def->tpms[i]->type =3D=3D VIR_DOMAIN_TPM_TYPE_EMULATOR && + qemuExtTPMSetupCgroup(driver, def, cgroup) < 0) + return -1; + } =20 for (i =3D 0; i < def->nfss; i++) { virDomainFSDef *fs =3D def->fss[i]; diff --git a/src/qemu/qemu_tpm.c b/src/qemu/qemu_tpm.c index 56bccee128..086780edcd 100644 --- a/src/qemu/qemu_tpm.c +++ b/src/qemu/qemu_tpm.c @@ -971,86 +971,59 @@ qemuTPMEmulatorStart(virQEMUDriver *driver, =20 int qemuExtTPMInitPaths(virQEMUDriver *driver, - virDomainDef *def) + virDomainDef *def, + virDomainTPMDef *tpm) { g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); - size_t i; =20 - for (i =3D 0; i < def->ntpms; i++) { - if (def->tpms[i]->type !=3D VIR_DOMAIN_TPM_TYPE_EMULATOR) - continue; - - return qemuTPMEmulatorInitPaths(def->tpms[i], - cfg->swtpmStorageDir, - cfg->swtpmLogDir, - def->name, - def->uuid); - } - - return 0; + return qemuTPMEmulatorInitPaths(tpm, + cfg->swtpmStorageDir, + cfg->swtpmLogDir, + def->name, + def->uuid); } =20 =20 int qemuExtTPMPrepareHost(virQEMUDriver *driver, - virDomainDef *def) + virDomainDef *def, + virDomainTPMDef *tpm) { g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); g_autofree char *shortName =3D virDomainDefGetShortName(def); - size_t i; =20 if (!shortName) return -1; =20 - for (i =3D 0; i < def->ntpms; i++) { - if (def->tpms[i]->type !=3D VIR_DOMAIN_TPM_TYPE_EMULATOR) - continue; - - return qemuTPMEmulatorPrepareHost(def->tpms[i], cfg->swtpmLogDir, - cfg->swtpm_user, - cfg->swtpm_group, - cfg->swtpmStateDir, cfg->user, - shortName); - } - - return 0; + return qemuTPMEmulatorPrepareHost(tpm, + cfg->swtpmLogDir, + cfg->swtpm_user, + cfg->swtpm_group, + cfg->swtpmStateDir, + cfg->user, + shortName); } =20 =20 void -qemuExtTPMCleanupHost(virDomainDef *def) +qemuExtTPMCleanupHost(virDomainTPMDef *tpm) { - size_t i; - - for (i =3D 0; i < def->ntpms; i++) { - if (def->tpms[i]->type !=3D VIR_DOMAIN_TPM_TYPE_EMULATOR) - continue; - - qemuTPMEmulatorCleanupHost(def->tpms[i]); - } + qemuTPMEmulatorCleanupHost(tpm); } =20 =20 int qemuExtTPMStart(virQEMUDriver *driver, virDomainObj *vm, + virDomainTPMDef *tpm, bool incomingMigration) { g_autofree char *shortName =3D virDomainDefGetShortName(vm->def); - size_t i; =20 if (!shortName) return -1; =20 - for (i =3D 0; i < vm->def->ntpms; i++) { - if (vm->def->tpms[i]->type !=3D VIR_DOMAIN_TPM_TYPE_EMULATOR) - continue; - - return qemuTPMEmulatorStart(driver, vm, shortName, vm->def->tpms[i= ], - incomingMigration); - } - - return 0; + return qemuTPMEmulatorStart(driver, vm, shortName, tpm, incomingMigrat= ion); } =20 =20 @@ -1060,20 +1033,12 @@ qemuExtTPMStop(virQEMUDriver *driver, { g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); g_autofree char *shortName =3D virDomainDefGetShortName(vm->def); - size_t i; =20 if (!shortName) return; =20 - for (i =3D 0; i < vm->def->ntpms; i++) { - if (vm->def->tpms[i]->type !=3D VIR_DOMAIN_TPM_TYPE_EMULATOR) - continue; - - qemuTPMEmulatorStop(cfg->swtpmStateDir, shortName); - qemuSecurityCleanupTPMEmulator(driver, vm); - } - - return; + qemuTPMEmulatorStop(cfg->swtpmStateDir, shortName); + qemuSecurityCleanupTPMEmulator(driver, vm); } =20 =20 @@ -1084,18 +1049,12 @@ qemuExtTPMSetupCgroup(virQEMUDriver *driver, { g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); g_autofree char *shortName =3D virDomainDefGetShortName(def); - size_t i; =20 if (!shortName) return -1; =20 - for (i =3D 0; i < def->ntpms; i++) { - if (def->tpms[i]->type !=3D VIR_DOMAIN_TPM_TYPE_EMULATOR) - continue; - - if (qemuExtTPMEmulatorSetupCgroup(cfg->swtpmStateDir, shortName, c= group) < 0) - return -1; - } + if (qemuExtTPMEmulatorSetupCgroup(cfg->swtpmStateDir, shortName, cgrou= p) < 0) + return -1; =20 return 0; } diff --git a/src/qemu/qemu_tpm.h b/src/qemu/qemu_tpm.h index da8ce4c369..9951f025a6 100644 --- a/src/qemu/qemu_tpm.h +++ b/src/qemu/qemu_tpm.h @@ -23,22 +23,27 @@ #include "vircommand.h" =20 int qemuExtTPMInitPaths(virQEMUDriver *driver, - virDomainDef *def) + virDomainDef *def, + virDomainTPMDef *tpm) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT; =20 int qemuExtTPMPrepareHost(virQEMUDriver *driver, - virDomainDef *def) + virDomainDef *def, + virDomainTPMDef *tpm) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) + ATTRIBUTE_NONNULL(3) G_GNUC_WARN_UNUSED_RESULT; =20 -void qemuExtTPMCleanupHost(virDomainDef *def) +void qemuExtTPMCleanupHost(virDomainTPMDef *tpm) ATTRIBUTE_NONNULL(1); =20 int qemuExtTPMStart(virQEMUDriver *driver, virDomainObj *vm, + virDomainTPMDef *def, bool incomingMigration) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) + ATTRIBUTE_NONNULL(3) G_GNUC_WARN_UNUSED_RESULT; =20 void qemuExtTPMStop(virQEMUDriver *driver, --=20 2.35.1