From nobody Mon Feb 9 05:29:57 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=1639053247; cv=none; d=zohomail.com; s=zohoarc; b=F1TuXtbX3+XV9DO3thTOQ3RxH+vZ07fLtq+UfU1ZyjV42PahrqIrWbm5bccJBb8TrxRCRIcBCHPVnPar4RWwm0WR+7hkn6Fwxsf5gCptv6vRwdcHLVVpC/wR3lRs0YZjtJ50+ziQ5Dn2ic/CfLHsc92JCww+oAQAAMjmN3QU9M0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1639053247; 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=DI4ONd8zjGKT3wf/vaUZgc1QmHf+tPRzfrsdHRyPBnY=; b=LqLsUnb+rojSsZu3/wNYjT+G+gK5fVXNfnsOBj7XwTKtQgG6wLGOEZkV0FOTYA6LLodqO67wwvVOZxFfzuM0VdmWg1M0sVWqNsgEnDNVbHm6trR6JDvni0F3HuCe2+EsIhzAOdyWUBXjb/tG9U2lGao7TCV1RcWsrDtcBmD73H4= 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 1639053247948651.66377995915; Thu, 9 Dec 2021 04:34:07 -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-587-2ORboVFPMx2GPdIExSDRQg-1; Thu, 09 Dec 2021 07:34:05 -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 3513A10144FC; Thu, 9 Dec 2021 12:33:58 +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 EF12C5BE2C; Thu, 9 Dec 2021 12:33:57 +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 B536818218B8; Thu, 9 Dec 2021 12:33:57 +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 1B9CVITW017784 for ; Thu, 9 Dec 2021 07:31:18 -0500 Received: by smtp.corp.redhat.com (Postfix) id CAD4E4ABA1; Thu, 9 Dec 2021 12:31:18 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.10]) by smtp.corp.redhat.com (Postfix) with ESMTP id 249291B472 for ; Thu, 9 Dec 2021 12:31:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1639053246; 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=DI4ONd8zjGKT3wf/vaUZgc1QmHf+tPRzfrsdHRyPBnY=; b=gVymofYAkKEpKRkr95azKCn2YlHuZvUBZwWt+im3XEU4T5teG9KvLAGumuty7dkE3X/l96 /wVbeE8yyDtD00lrr+0RpPpWvVReS4Fs8N2P1mgzBBh7tYc2wKA7drnbJVFb+D5uHDr7Im JlopcHos1/orC9Ozh23zQCkSLUvIPXs= X-MC-Unique: 2ORboVFPMx2GPdIExSDRQg-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 16/24] qemuBuildChardevCommand: Split creation of the command and setup of other objects Date: Thu, 9 Dec 2021 13:30:51 +0100 Message-Id: <44e29c01b248267b5dad7430027014db16cd7884.1639052639.git.pkrempa@redhat.com> 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.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-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1639053248501100001 Content-Type: text/plain; charset="utf-8" Completely seprate the creation of the commandline string from the setup of other objects instantiated on the commandline. 'qemuBuildChardevCommand' will aggregate the setup of individual parameters such as -add-fd and setup of TLS and the -chardev parameter itself while the code formatting the commandline will be moved into qemuBuildChardevStr. 'fdset' names are then stored in qemuDomainChrSourcePrivate. Signed-off-by: Peter Krempa --- src/qemu/qemu_command.c | 204 ++++++++++++++++++++++++++-------------- src/qemu/qemu_domain.c | 6 ++ src/qemu/qemu_domain.h | 5 + 3 files changed, 145 insertions(+), 70 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 26cb25a70c..910508e725 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1318,16 +1318,15 @@ qemuBuildChrChardevReconnectStr(virBuffer *buf, } -static int -qemuBuildChardevCommand(virCommand *cmd, - virQEMUDriverConfig *cfg, - const virDomainChrSourceDef *dev, - const char *charAlias, - virQEMUCaps *qemuCaps) +static char * +qemuBuildChardevStr(const virDomainChrSourceDef *dev, + const char *charAlias) { + qemuDomainChrSourcePrivate *chrSourcePriv =3D QEMU_DOMAIN_CHR_SOURCE_P= RIVATE(dev); g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; - bool telnet; + const char *path; + virTristateSwitch append; switch ((virDomainChrType) dev->type) { case VIR_DOMAIN_CHR_TYPE_NULL: @@ -1351,27 +1350,19 @@ qemuBuildChardevCommand(virCommand *cmd, case VIR_DOMAIN_CHR_TYPE_FILE: virBufferAsprintf(&buf, "file,id=3D%s", charAlias); + path =3D dev->data.file.path; + append =3D dev->data.file.append; - if (chrSourcePriv->fd !=3D -1) { - g_autofree char *fdset =3D NULL; - size_t idx; - - virCommandPassFDIndex(cmd, chrSourcePriv->fd, - VIR_COMMAND_PASS_FD_CLOSE_PARENT, &idx); - fdset =3D qemuBuildFDSet(chrSourcePriv->fd, idx); - chrSourcePriv->fd =3D -1; - - virCommandAddArg(cmd, "-add-fd"); - virCommandAddArg(cmd, fdset); + if (chrSourcePriv->fdset) { + path =3D chrSourcePriv->fdset; + append =3D VIR_TRISTATE_SWITCH_ON; + } - virBufferAsprintf(&buf, ",path=3D/dev/fdset/%zu,append=3Don", = idx); - } else { - virBufferAddLit(&buf, ",path=3D"); - virQEMUBuildBufferEscapeComma(&buf, dev->data.file.path); - if (dev->data.file.append !=3D VIR_TRISTATE_SWITCH_ABSENT) { - virBufferAsprintf(&buf, ",append=3D%s", - virTristateSwitchTypeToString(dev->data.= file.append)); - } + virBufferAddLit(&buf, ",path=3D"); + virQEMUBuildBufferEscapeComma(&buf, path); + if (append !=3D VIR_TRISTATE_SWITCH_ABSENT) { + virBufferAsprintf(&buf, ",append=3D%s", + virTristateSwitchTypeToString(append)); } break; @@ -1405,14 +1396,16 @@ qemuBuildChardevCommand(virCommand *cmd, bindHost, bindService); break; } + case VIR_DOMAIN_CHR_TYPE_TCP: - telnet =3D dev->data.tcp.protocol =3D=3D VIR_DOMAIN_CHR_TCP_PROTOC= OL_TELNET; virBufferAsprintf(&buf, - "socket,id=3D%s,host=3D%s,port=3D%s%s", + "socket,id=3D%s,host=3D%s,port=3D%s", charAlias, dev->data.tcp.host, - dev->data.tcp.service, - telnet ? ",telnet=3Don" : ""); + dev->data.tcp.service); + + if (dev->data.tcp.protocol =3D=3D VIR_DOMAIN_CHR_TCP_PROTOCOL_TELN= ET) + virBufferAddLit(&buf, ",telnet=3Don"); if (dev->data.tcp.listen) { virBufferAddLit(&buf, ",server=3Don"); @@ -1422,6 +1415,77 @@ qemuBuildChardevCommand(virCommand *cmd, qemuBuildChrChardevReconnectStr(&buf, &dev->data.tcp.reconnect); + if (chrSourcePriv->tlsCredsAlias) + virBufferAsprintf(&buf, ",tls-creds=3D%s", chrSourcePriv->tlsC= redsAlias); + break; + + case VIR_DOMAIN_CHR_TYPE_UNIX: + virBufferAsprintf(&buf, "socket,id=3D%s", charAlias); + if (chrSourcePriv->passedFD !=3D -1) { + virBufferAsprintf(&buf, ",fd=3D%d", chrSourcePriv->passedFD); + } else { + virBufferAddLit(&buf, ",path=3D"); + virQEMUBuildBufferEscapeComma(&buf, dev->data.nix.path); + } + + if (dev->data.nix.listen) { + virBufferAddLit(&buf, ",server=3Don"); + if (!chrSourcePriv->wait) + virBufferAddLit(&buf, ",wait=3Doff"); + } + + qemuBuildChrChardevReconnectStr(&buf, &dev->data.nix.reconnect); + break; + + case VIR_DOMAIN_CHR_TYPE_SPICEVMC: + virBufferAsprintf(&buf, "spicevmc,id=3D%s,name=3D%s", charAlias, + virDomainChrSpicevmcTypeToString(dev->data.spice= vmc)); + break; + + case VIR_DOMAIN_CHR_TYPE_SPICEPORT: + virBufferAsprintf(&buf, "spiceport,id=3D%s,name=3D%s", charAlias, + dev->data.spiceport.channel); + break; + + case VIR_DOMAIN_CHR_TYPE_NMDM: + case VIR_DOMAIN_CHR_TYPE_LAST: + default: + break; + } + + if (dev->logfile) { + path =3D dev->logfile; + append =3D dev->logappend; + + if (chrSourcePriv->logFdset) { + path =3D chrSourcePriv->logFdset; + append =3D VIR_TRISTATE_SWITCH_ON; + } + + virBufferAddLit(&buf, ",logfile=3D"); + virQEMUBuildBufferEscapeComma(&buf, path); + if (append !=3D VIR_TRISTATE_SWITCH_ABSENT) { + virBufferAsprintf(&buf, ",logappend=3D%s", + virTristateSwitchTypeToString(append)); + } + } + + return virBufferContentAndReset(&buf); +} + + +static int +qemuBuildChardevCommand(virCommand *cmd, + virQEMUDriverConfig *cfg, + const virDomainChrSourceDef *dev, + const char *charAlias, + virQEMUCaps *qemuCaps) +{ + qemuDomainChrSourcePrivate *chrSourcePriv =3D QEMU_DOMAIN_CHR_SOURCE_P= RIVATE(dev); + g_autofree char *charstr =3D NULL; + + switch ((virDomainChrType) dev->type) { + case VIR_DOMAIN_CHR_TYPE_TCP: if (dev->data.tcp.haveTLS =3D=3D VIR_TRISTATE_BOOL_YES) { g_autofree char *objalias =3D NULL; const char *tlsCertEncSecAlias =3D NULL; @@ -1450,38 +1514,44 @@ qemuBuildChardevCommand(virCommand *cmd, return -1; } - virBufferAsprintf(&buf, ",tls-creds=3D%s", objalias); + chrSourcePriv->tlsCredsAlias =3D g_steal_pointer(&objalias); } break; - case VIR_DOMAIN_CHR_TYPE_UNIX: - virBufferAsprintf(&buf, "socket,id=3D%s", charAlias); + case VIR_DOMAIN_CHR_TYPE_FILE: if (chrSourcePriv->fd !=3D -1) { - virBufferAsprintf(&buf, ",fd=3D%d", chrSourcePriv->fd); + g_autofree char *fdset =3D NULL; + size_t idx; - virCommandPassFD(cmd, chrSourcePriv->fd, VIR_COMMAND_PASS_FD_C= LOSE_PARENT); + virCommandPassFDIndex(cmd, chrSourcePriv->fd, + VIR_COMMAND_PASS_FD_CLOSE_PARENT, &idx); + fdset =3D qemuBuildFDSet(chrSourcePriv->fd, idx); chrSourcePriv->fd =3D -1; - } else { - virBufferAddLit(&buf, ",path=3D"); - virQEMUBuildBufferEscapeComma(&buf, dev->data.nix.path); - } - if (dev->data.nix.listen) { - virBufferAddLit(&buf, ",server=3Don"); - if (!chrSourcePriv->wait) - virBufferAddLit(&buf, ",wait=3Doff"); - } - qemuBuildChrChardevReconnectStr(&buf, &dev->data.nix.reconnect); + virCommandAddArg(cmd, "-add-fd"); + virCommandAddArg(cmd, fdset); + + chrSourcePriv->fdset =3D g_strdup_printf("/dev/fdset/%zu", idx= ); + } break; - case VIR_DOMAIN_CHR_TYPE_SPICEVMC: - virBufferAsprintf(&buf, "spicevmc,id=3D%s,name=3D%s", charAlias, - virDomainChrSpicevmcTypeToString(dev->data.spice= vmc)); + case VIR_DOMAIN_CHR_TYPE_UNIX: + if (chrSourcePriv->fd !=3D -1) { + virCommandPassFD(cmd, chrSourcePriv->fd, VIR_COMMAND_PASS_FD_C= LOSE_PARENT); + chrSourcePriv->passedFD =3D chrSourcePriv->fd; + chrSourcePriv->fd =3D -1; + } break; + case VIR_DOMAIN_CHR_TYPE_NULL: + case VIR_DOMAIN_CHR_TYPE_VC: + case VIR_DOMAIN_CHR_TYPE_PTY: + case VIR_DOMAIN_CHR_TYPE_DEV: + case VIR_DOMAIN_CHR_TYPE_PIPE: + case VIR_DOMAIN_CHR_TYPE_STDIO: + case VIR_DOMAIN_CHR_TYPE_UDP: + case VIR_DOMAIN_CHR_TYPE_SPICEVMC: case VIR_DOMAIN_CHR_TYPE_SPICEPORT: - virBufferAsprintf(&buf, "spiceport,id=3D%s,name=3D%s", charAlias, - dev->data.spiceport.channel); break; case VIR_DOMAIN_CHR_TYPE_NMDM: @@ -1493,31 +1563,25 @@ qemuBuildChardevCommand(virCommand *cmd, return -1; } - if (dev->logfile) { - if (chrSourcePriv->logfd !=3D -1) { - g_autofree char *fdset =3D NULL; - size_t idx; + if (chrSourcePriv->logfd !=3D -1) { + g_autofree char *fdset =3D NULL; + size_t idx; - virCommandPassFDIndex(cmd, chrSourcePriv->logfd, - VIR_COMMAND_PASS_FD_CLOSE_PARENT, &idx); - fdset =3D qemuBuildFDSet(chrSourcePriv->logfd, idx); - chrSourcePriv->logfd =3D -1; + virCommandPassFDIndex(cmd, chrSourcePriv->logfd, + VIR_COMMAND_PASS_FD_CLOSE_PARENT, &idx); + fdset =3D qemuBuildFDSet(chrSourcePriv->logfd, idx); + chrSourcePriv->logfd =3D -1; - virCommandAddArg(cmd, "-add-fd"); - virCommandAddArg(cmd, fdset); + virCommandAddArg(cmd, "-add-fd"); + virCommandAddArg(cmd, fdset); - virBufferAsprintf(&buf, ",logfile=3D/dev/fdset/%zu,logappend= =3Don", idx); - } else { - virBufferAddLit(&buf, ",logfile=3D"); - virQEMUBuildBufferEscapeComma(&buf, dev->logfile); - if (dev->logappend !=3D VIR_TRISTATE_SWITCH_ABSENT) { - virBufferAsprintf(&buf, ",logappend=3D%s", - virTristateSwitchTypeToString(dev->logap= pend)); - } - } + chrSourcePriv->logFdset =3D g_strdup_printf("/dev/fdset/%zu", idx); } - virCommandAddArgList(cmd, "-chardev", virBufferCurrentContent(&buf), N= ULL); + if (!(charstr =3D qemuBuildChardevStr(dev, charAlias))) + return -1; + + virCommandAddArgList(cmd, "-chardev", charstr, NULL); return 0; } diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index e6d6bf10f1..a2ee160128 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -853,6 +853,8 @@ qemuDomainChrSourcePrivateNew(void) priv->fd =3D -1; priv->logfd =3D -1; + priv->passedFD =3D -1; + return (virObject *) priv; } @@ -865,6 +867,10 @@ qemuDomainChrSourcePrivateDispose(void *obj) VIR_FORCE_CLOSE(priv->fd); VIR_FORCE_CLOSE(priv->logfd); + g_free(priv->fdset); + g_free(priv->logFdset); + g_free(priv->tlsCredsAlias); + g_clear_pointer(&priv->secinfo, qemuDomainSecretInfoFree); } diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index 2d93cf2253..d07def3d85 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -345,6 +345,11 @@ struct _qemuDomainChrSourcePrivate { int fd; /* file descriptor of the chardev source */ int logfd; /* file descriptor of the logging source */ bool wait; /* wait for incomming connections on chardev */ + + char *fdset; /* fdset path corresponding to the passed filedescriptor = */ + char *logFdset; /* fdset path corresponding to the passed filedescript= or for logfile */ + int passedFD; /* filedescriptor number when fdset passing it directly = */ + char *tlsCredsAlias; /* alias of the x509 tls credentials object */ }; --=20 2.31.1