From nobody Tue May 13 13:24:37 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1538681020075456.2586932493649; Thu, 4 Oct 2018 12:23:40 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id EC8399B438; Thu, 4 Oct 2018 19:23:36 +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 AF90577F02; Thu, 4 Oct 2018 19:23:36 +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 675DE3D381; Thu, 4 Oct 2018 19:23:36 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w94JN2Zr028110 for ; Thu, 4 Oct 2018 15:23:02 -0400 Received: by smtp.corp.redhat.com (Postfix) id 3E0D118EF3; Thu, 4 Oct 2018 19:23:02 +0000 (UTC) Received: from icr.brq.redhat.com (unknown [10.43.2.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id B545818AD9 for ; Thu, 4 Oct 2018 19:23:01 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Thu, 4 Oct 2018 21:22:40 +0200 Message-Id: <25883c38335141bfe371a7e68042638a45dc4be0.1538680720.git.jtomko@redhat.com> In-Reply-To: References: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 12/15] qemuBuildChrChardevStr: pass fd from private data 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: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Thu, 04 Oct 2018 19:23:39 +0000 (UTC) X-ZohoMail: RDMRC_0 RSF_0 Z_629925259 SPT_0 If present, prefer the file descriptor created earlier instead of creating one in a qemuBuild function. Signed-off-by: J=C3=A1n Tomko --- src/qemu/qemu_command.c | 23 +++------ src/qemu/qemu_process.c | 127 ++++++++++++++++++++++++++++++++++++++++++++= ++++ 2 files changed, 133 insertions(+), 17 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 25ea127095..54a1a299e2 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -5058,7 +5058,7 @@ enum { * host side of the character device */ static char * qemuBuildChrChardevStr(virLogManagerPtr logManager, - virSecurityManagerPtr secManager, + virSecurityManagerPtr secManager ATTRIBUTE_UNUSED, virCommandPtr cmd, virQEMUDriverConfigPtr cfg, const virDomainDef *def, @@ -5195,22 +5195,11 @@ qemuBuildChrChardevStr(virLogManagerPtr logManager, =20 case VIR_DOMAIN_CHR_TYPE_UNIX: virBufferAsprintf(&buf, "socket,id=3D%s", charAlias); - if (dev->data.nix.listen && - (flags & QEMU_BUILD_CHARDEV_UNIX_FD_PASS) && - virQEMUCapsGet(qemuCaps, QEMU_CAPS_CHARDEV_FD_PASS)) { - if (qemuSecuritySetSocketLabel(secManager, (virDomainDefPtr)de= f) < 0) - goto cleanup; - int fd =3D qemuOpenChrChardevUNIXSocket(dev); - if (qemuSecurityClearSocketLabel(secManager, (virDomainDefPtr)= def) < 0) { - VIR_FORCE_CLOSE(fd); - goto cleanup; - } - if (fd < 0) - goto cleanup; - - virBufferAsprintf(&buf, ",fd=3D%d", fd); - - virCommandPassFD(cmd, fd, VIR_COMMAND_PASS_FD_CLOSE_PARENT); + if (chrSourcePriv && + chrSourcePriv->fd !=3D -1) { + virBufferAsprintf(&buf, ",fd=3D%d", chrSourcePriv->fd); + virCommandPassFD(cmd, chrSourcePriv->fd, VIR_COMMAND_PASS_FD_C= LOSE_PARENT); + chrSourcePriv->fd =3D -1; } else { virBufferAddLit(&buf, ",path=3D"); virQEMUBuildBufferEscapeComma(&buf, dev->data.nix.path); diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 77b7464436..f315d28dd0 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -6136,6 +6136,127 @@ qemuProcessOpenVhostVsock(virDomainVsockDefPtr vsoc= k) } =20 =20 +static int +qemuProcessMaybeOpenChrSource(virDomainObjPtr vm, + const virDomainChrSourceDef *src) +{ + qemuDomainChrSourcePrivatePtr srcPriv =3D QEMU_DOMAIN_CHR_SOURCE_PRIVA= TE(src); + qemuDomainObjPrivatePtr priv =3D vm->privateData; + virQEMUDriverPtr driver =3D priv->driver; + virQEMUCapsPtr qemuCaps =3D priv->qemuCaps; + int fd =3D -1; + int ret =3D -1; + + if (src->type !=3D VIR_DOMAIN_CHR_TYPE_UNIX) + return 0; + + if (!src->data.nix.listen) + return 0; + + if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_CHARDEV_FD_PASS)) + return 0; + + if (qemuSecuritySetSocketLabel(driver->securityManager, vm->def) < 0) + goto cleanup; + fd =3D qemuOpenChrChardevUNIXSocket(src); + if (qemuSecurityClearSocketLabel(driver->securityManager, vm->def) < 0) + goto cleanup; + + if (fd < 0) + goto cleanup; + + srcPriv->fd =3D fd; + fd =3D -1; + ret =3D 0; + + cleanup: + VIR_FORCE_CLOSE(fd); + return ret; +} + + +static int +qemuProcessPrepareChrFDs(virDomainObjPtr vm, + virDomainDefPtr def) +{ + qemuDomainObjPrivatePtr priv =3D vm->privateData; + int ret =3D -1; + size_t i; + + if (priv->monConfig) { + if (qemuProcessMaybeOpenChrSource(vm, priv->monConfig) < 0) + goto cleanup; + } + + /* VIR_DOMAIN_NET_TYPE_VHOSTUSER can be backed by a chardev + * but FD passing does not work, see commit ed5aa85f3 */ + + for (i =3D 0; i < def->nsmartcards; i++) { + virDomainSmartcardDefPtr smartcard =3D def->smartcards[i]; + if (smartcard->type !=3D VIR_DOMAIN_SMARTCARD_TYPE_PASSTHROUGH) + continue; + if (qemuProcessMaybeOpenChrSource(vm, smartcard->data.passthru) < = 0) + goto cleanup; + } + + /* Shmems can also have a chardev source, but the listen mode is + * set to false in the XML parser. Nothing to do here */ + + for (i =3D 0; i < def->nserials; i++) { + virDomainChrDefPtr serial =3D def->serials[i]; + if (qemuProcessMaybeOpenChrSource(vm, serial->source) < 0) + goto cleanup; + } + + for (i =3D 0; i < def->nparallels; i++) { + virDomainChrDefPtr parallel =3D def->parallels[i]; + if (qemuProcessMaybeOpenChrSource(vm, parallel->source) < 0) + goto cleanup; + } + + for (i =3D 0; i < def->nchannels; i++) { + virDomainChrDefPtr channel =3D def->channels[i]; + if (channel->targetType !=3D VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_GU= ESTFWD && + channel->targetType !=3D VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_VI= RTIO) + continue; + if (qemuProcessMaybeOpenChrSource(vm, channel->source) < 0) + goto cleanup; + } + + for (i =3D 0; i < def->nconsoles; i++) { + virDomainChrDefPtr console =3D def->consoles[i]; + if (console->targetType =3D=3D VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_= SERIAL) + continue; + if (qemuProcessMaybeOpenChrSource(vm, console->source) < 0) + goto cleanup; + } + + for (i =3D 0; i < def->nredirdevs; i++) { + virDomainRedirdevDefPtr redirdev =3D def->redirdevs[i]; + if (qemuProcessMaybeOpenChrSource(vm, redirdev->source) < 0) + goto cleanup; + } + + for (i =3D 0; i < def->nrngs; i++) { + virDomainRNGDefPtr rng =3D def->rngs[i]; + switch ((virDomainRNGBackend) rng->backend) { + case VIR_DOMAIN_RNG_BACKEND_RANDOM: + case VIR_DOMAIN_RNG_BACKEND_LAST: + /* no chardev backend is needed */ + return 0; + + case VIR_DOMAIN_RNG_BACKEND_EGD: + if (qemuProcessMaybeOpenChrSource(vm, rng->source.chardev) < 0) + goto cleanup; + } + } + + ret =3D 0; + cleanup: + return ret; +} + + /** * qemuProcessPrepareHost: * @driver: qemu driver @@ -6228,6 +6349,9 @@ qemuProcessPrepareHost(virQEMUDriverPtr driver, qemuProcessMakeDir(driver, vm, priv->channelTargetDir) < 0) goto cleanup; =20 + if (qemuProcessPrepareChrFDs(vm, vm->def) < 0) + goto cleanup; + VIR_DEBUG("Write domain masterKey"); if (qemuDomainWriteMasterKeyFile(driver, vm) < 0) goto cleanup; @@ -6886,6 +7010,9 @@ qemuProcessCreatePretendCmd(virQEMUDriverPtr driver, if (qemuProcessPrepareDomain(driver, vm, flags) < 0) goto cleanup; =20 + if (qemuProcessPrepareChrFDs(vm, vm->def) < 0) + goto cleanup; + VIR_DEBUG("Building emulator command line"); cmd =3D qemuBuildCommandLine(driver, NULL, --=20 2.16.4 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list