From nobody Mon Feb 9 07:35: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=1639053233; cv=none; d=zohomail.com; s=zohoarc; b=Knm3Mp13Vj//VzVycGLORpoGEh8F48rWjkpZZYpu4TyFWaDsnmbVpOOxbm59e5rCGXV9WmCUrX1wXsA7RXB4F0XRfjM/7Wdmlbm0+7+TpzpwD+AXg24CjY/hAVSyzawwSmGaHnLRJ0Bq+SBUQz4jeRnL1Z2og9r4sfajfv0vHJk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1639053233; 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=nWvjv9Agmg5LOHNQmmXxJTppt6SQ72o2z5gHRRvyl1A=; b=gAkhDswWfVR6jBFHE8IWktaEtYzHddHO6r1pYZnApi7TGsSYihA2jV3KJJ4VoJatjKQZ0haabzgsONZEPMA5HxnuhuDMKFM3+fQSZhuQKaI90Z9022wrVQJ56HXT4RWE3b2Uns7mPtyObitFu5jzkUTrI+mtlk1ugXUOp1Jl2F4= 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 16390532335181021.1057001450107; Thu, 9 Dec 2021 04:33:53 -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-158-Jo1K91nVN5-4ItBUwqnbtQ-1; Thu, 09 Dec 2021 07:33:49 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 94251802E6E; Thu, 9 Dec 2021 12:33:43 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 743A75ED36; Thu, 9 Dec 2021 12:33:43 +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 41DB64BB7C; Thu, 9 Dec 2021 12:33:43 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 1B9CV70H017639 for ; Thu, 9 Dec 2021 07:31:07 -0500 Received: by smtp.corp.redhat.com (Postfix) id D3BCC4ABA1; Thu, 9 Dec 2021 12:31:07 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.10]) by smtp.corp.redhat.com (Postfix) with ESMTP id 426001B472 for ; Thu, 9 Dec 2021 12:31:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1639053232; 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=nWvjv9Agmg5LOHNQmmXxJTppt6SQ72o2z5gHRRvyl1A=; b=Yf/W0kGu6Bfo+XtsmI0yVuRBrSupTpRCIE8aMsnvVDVFeDKyhekVKq5mW57HTZqpKJpRfX db1ExBNnF5oYiSAl5rZort/1MiigJV5FaYKXvyh/kuzVVBOE885vfh6xWOpFXCpGRFzm12 kHNHduNb8wPvi8ZikKgWmI/dzR3cyqM= X-MC-Unique: Jo1K91nVN5-4ItBUwqnbtQ-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 06/24] qemu: domain: Refactor chardev definition preparing Date: Thu, 9 Dec 2021 13:30:41 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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.14 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: 1639053233875100003 Content-Type: text/plain; charset="utf-8" Use the qemuDomainDeviceBackendChardevForeach helper to iterate all eligible structs and convert the setup of the TLS defaults from the config. Signed-off-by: Peter Krempa --- src/qemu/qemu_domain.c | 103 +++++++++++++++++++--------------------- src/qemu/qemu_domain.h | 13 ++--- src/qemu/qemu_driver.c | 7 +++ src/qemu/qemu_hotplug.c | 3 -- src/qemu/qemu_process.c | 23 ++++++++- 5 files changed, 85 insertions(+), 64 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index cbaa39b618..550afca36e 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -9720,66 +9720,63 @@ qemuDomainPrepareChannel(virDomainChrDef *channel, } -/* qemuDomainPrepareChardevSourceTLS: - * @source: pointer to host interface data for char devices - * @cfg: driver configuration - * - * Updates host interface TLS encryption setting based on qemu.conf - * for char devices. This will be presented as "tls=3D'yes|no'" in - * live XML of a guest. - */ -void -qemuDomainPrepareChardevSourceTLS(virDomainChrSourceDef *source, - virQEMUDriverConfig *cfg) -{ - if (source->type =3D=3D VIR_DOMAIN_CHR_TYPE_TCP) { - if (source->data.tcp.haveTLS =3D=3D VIR_TRISTATE_BOOL_ABSENT) { - if (cfg->chardevTLS) - source->data.tcp.haveTLS =3D VIR_TRISTATE_BOOL_YES; - else - source->data.tcp.haveTLS =3D VIR_TRISTATE_BOOL_NO; - source->data.tcp.tlsFromConfig =3D true; - } - } -} - - -/* qemuDomainPrepareChardevSource: - * @def: live domain definition - * @cfg: driver configuration +/* qemuDomainPrepareChardevSourceOne: + * @dev: device definition + * @charsrc: chardev source definition + * @opaque: pointer to struct qemuDomainPrepareChardevSourceData * - * Iterate through all devices that use virDomainChrSourceDef *as host - * interface part. + * Updates the config of a chardev source based on the qemu driver configu= ration. + * Note that this is meant to be called via + * qemuDomainDeviceBackendChardevForeach(One). */ -void -qemuDomainPrepareChardevSource(virDomainDef *def, - virQEMUDriverConfig *cfg) +int +qemuDomainPrepareChardevSourceOne(virDomainDeviceDef *dev, + virDomainChrSourceDef *charsrc, + void *opaque) { - size_t i; - - for (i =3D 0; i < def->nserials; i++) - qemuDomainPrepareChardevSourceTLS(def->serials[i]->source, cfg); - - for (i =3D 0; i < def->nparallels; i++) - qemuDomainPrepareChardevSourceTLS(def->parallels[i]->source, cfg); + struct qemuDomainPrepareChardevSourceData *data =3D opaque; - for (i =3D 0; i < def->nchannels; i++) - qemuDomainPrepareChardevSourceTLS(def->channels[i]->source, cfg); - - for (i =3D 0; i < def->nconsoles; i++) - qemuDomainPrepareChardevSourceTLS(def->consoles[i]->source, cfg); + switch ((virDomainDeviceType) dev->type) { - for (i =3D 0; i < def->nrngs; i++) - if (def->rngs[i]->backend =3D=3D VIR_DOMAIN_RNG_BACKEND_EGD) - qemuDomainPrepareChardevSourceTLS(def->rngs[i]->source.chardev= , cfg); + case VIR_DOMAIN_DEVICE_CHR: + case VIR_DOMAIN_DEVICE_RNG: + case VIR_DOMAIN_DEVICE_SMARTCARD: + case VIR_DOMAIN_DEVICE_REDIRDEV: + if (charsrc->type =3D=3D VIR_DOMAIN_CHR_TYPE_TCP) { + if (charsrc->data.tcp.haveTLS =3D=3D VIR_TRISTATE_BOOL_ABSENT)= { + charsrc->data.tcp.haveTLS =3D virTristateBoolFromBool(data= ->cfg->chardevTLS); + charsrc->data.tcp.tlsFromConfig =3D true; + } + } + break; - for (i =3D 0; i < def->nsmartcards; i++) - if (def->smartcards[i]->type =3D=3D VIR_DOMAIN_SMARTCARD_TYPE_PASS= THROUGH) - qemuDomainPrepareChardevSourceTLS(def->smartcards[i]->data.pas= sthru, - cfg); + case VIR_DOMAIN_DEVICE_DISK: + case VIR_DOMAIN_DEVICE_NET: + case VIR_DOMAIN_DEVICE_SHMEM: + case VIR_DOMAIN_DEVICE_LEASE: + case VIR_DOMAIN_DEVICE_FS: + case VIR_DOMAIN_DEVICE_INPUT: + case VIR_DOMAIN_DEVICE_SOUND: + case VIR_DOMAIN_DEVICE_VIDEO: + case VIR_DOMAIN_DEVICE_HOSTDEV: + case VIR_DOMAIN_DEVICE_WATCHDOG: + case VIR_DOMAIN_DEVICE_CONTROLLER: + case VIR_DOMAIN_DEVICE_GRAPHICS: + case VIR_DOMAIN_DEVICE_HUB: + case VIR_DOMAIN_DEVICE_NONE: + case VIR_DOMAIN_DEVICE_MEMBALLOON: + case VIR_DOMAIN_DEVICE_NVRAM: + case VIR_DOMAIN_DEVICE_TPM: + case VIR_DOMAIN_DEVICE_PANIC: + case VIR_DOMAIN_DEVICE_LAST: + case VIR_DOMAIN_DEVICE_MEMORY: + case VIR_DOMAIN_DEVICE_IOMMU: + case VIR_DOMAIN_DEVICE_VSOCK: + case VIR_DOMAIN_DEVICE_AUDIO: + break; + } - for (i =3D 0; i < def->nredirdevs; i++) - qemuDomainPrepareChardevSourceTLS(def->redirdevs[i]->source, cfg); + return 0; } diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index 61704fdae7..f84acf408b 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -864,13 +864,14 @@ int qemuDomainPrepareChannel(virDomainChrDef *chr, const char *domainChannelTargetDir) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); -void qemuDomainPrepareChardevSourceTLS(virDomainChrSourceDef *source, - virQEMUDriverConfig *cfg) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); +struct qemuDomainPrepareChardevSourceData { + virQEMUDriverConfig *cfg; +}; -void qemuDomainPrepareChardevSource(virDomainDef *def, - virQEMUDriverConfig *cfg) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); +int +qemuDomainPrepareChardevSourceOne(virDomainDeviceDef *dev, + virDomainChrSourceDef *charsrc, + void *opaque); void qemuDomainPrepareShmemChardev(virDomainShmemDef *shmem) ATTRIBUTE_NONNULL(1); diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 8093b8f69b..10feb606ad 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -6793,6 +6793,13 @@ qemuDomainAttachDeviceLive(virDomainObj *vm, { int ret =3D -1; const char *alias =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); + struct qemuDomainPrepareChardevSourceData chardevBackendData =3D { .cf= g =3D cfg }; + + if (qemuDomainDeviceBackendChardevForeachOne(dev, + qemuDomainPrepareChardevS= ourceOne, + &chardevBackendData) < 0) + return -1; switch ((virDomainDeviceType)dev->type) { case VIR_DOMAIN_DEVICE_DISK: diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 2e1d18c633..66961eba70 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1852,9 +1852,6 @@ qemuDomainAddChardevTLSObjects(virQEMUDriver *driver, g_autoptr(virJSONValue) tlsProps =3D NULL; g_autoptr(virJSONValue) secProps =3D NULL; - /* NB: This may alter haveTLS based on cfg */ - qemuDomainPrepareChardevSourceTLS(dev, cfg); - if (dev->type !=3D VIR_DOMAIN_CHR_TYPE_TCP || dev->data.tcp.haveTLS !=3D VIR_TRISTATE_BOOL_YES) return 0; diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 866b6b9ed6..be49cc9360 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -6498,6 +6498,24 @@ qemuProcessUpdateSEVInfo(virDomainObj *vm) } +/* qemuProcessPrepareChardevSource: + * @def: live domain definition + * @cfg: driver configuration + * + * Iterate through all devices that use virDomainChrSourceDef as backend. + */ +static int +qemuProcessPrepareChardevSource(virDomainDef *def, + virQEMUDriverConfig *cfg) +{ + struct qemuDomainPrepareChardevSourceData data =3D { .cfg =3D cfg }; + + return qemuDomainDeviceBackendChardevForeach(def, + qemuDomainPrepareChardevS= ourceOne, + &data); +} + + /** * qemuProcessPrepareDomain: * @driver: qemu driver @@ -6586,8 +6604,9 @@ qemuProcessPrepareDomain(virQEMUDriver *driver, if (qemuProcessPrepareDomainHostdevs(vm, priv) < 0) return -1; - VIR_DEBUG("Prepare chardev source backends for TLS"); - qemuDomainPrepareChardevSource(vm->def, cfg); + VIR_DEBUG("Prepare chardev source backends"); + if (qemuProcessPrepareChardevSource(vm->def, cfg) < 0) + return -1; VIR_DEBUG("Prepare device secrets"); if (qemuDomainSecretPrepare(driver, vm) < 0) --=20 2.31.1