From nobody Wed Apr 15 07:04:19 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1775145614; cv=none; d=zohomail.com; s=zohoarc; b=W00HcE0z206crhVHvCBUsrmvvvXQqlSOl0Cq5Y+x00hJA72w0eQ0tXyypwqkkiQS3xXBUf9HElx30PTGGPmSwTsa/ANrFrqWZBbbxeB3gMhFteNJyouv3g8qKCwjREivcKxiVgeEPo6ToPlqRBNwZ8qgNiCXuLl/gSEkDewoUwA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1775145614; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:Subject:Subject:To:To:Message-Id; bh=UCq1xzM0A+4fL8c2cfIwgZ/A83L2A6oqU0kF3Aw8fJU=; b=KupQUuZqUvHGb1UbMi63hv/LZxPo9/T/kTpq9+BQw2YNF72hvQT8mreLuLf72yv6KpQeo8KFskhBmPU9uFYFka2r72NKWPVO/75PEE2ZIz2qmtzb54o6MlPYls+toKz6H8j6NqMaXfyPXBgMs1KQsgDnUA0KMMeUUCcZkszQ2Hc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1775145614163190.11427380060013; Thu, 2 Apr 2026 09:00:14 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 6BA4B4190F; Thu, 2 Apr 2026 11:59:49 -0400 (EDT) Received: from [172.19.199.12] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id DF0E241894; Thu, 2 Apr 2026 11:59:02 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 7BAC23F880; Thu, 2 Apr 2026 11:58:53 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 6F4CD3F2FB for ; Thu, 2 Apr 2026 11:58:46 -0400 (EDT) Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-467-57rTtxuXM2uMY4y_Zwse4g-1; Thu, 02 Apr 2026 11:58:44 -0400 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 2CA9F18002C9 for ; Thu, 2 Apr 2026 15:58:44 +0000 (UTC) Received: from colepc.redhat.com (unknown [10.22.80.230]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id A435C18001FE; Thu, 2 Apr 2026 15:58:43 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-4.8 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HELO_MISC_IP,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,SPF_PASS autolearn=unavailable autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1775145526; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UCq1xzM0A+4fL8c2cfIwgZ/A83L2A6oqU0kF3Aw8fJU=; b=Ec4Z4VkPMVz939eqp3GM0xbTmAdP5ALR8XAuyc5fUKkf9CusHeh+LfuDwsZ6ittcOk/n46 jNxJ4SIkUY3CjdjzthZ6WD5FG8rlBkGbHKZhl7B3RcMT9wSD8h1CwXOS98w8s5ciYxvCqF WDKI9mKlnzztzKmpf9/M/1HNMmhilpg= X-MC-Unique: 57rTtxuXM2uMY4y_Zwse4g-1 X-Mimecast-MFC-AGG-ID: 57rTtxuXM2uMY4y_Zwse4g_1775145524 To: devel@lists.libvirt.org Subject: [PATCH] qemu: virtiofs: make fs->sock guard more consistent Date: Thu, 2 Apr 2026 11:58:38 -0400 Message-ID: <2269966ba32c15f57045851938d7471e47151f76.1775145518.git.crobinso@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: Fx-n2lnz1PmI4cn8lZ_0Yoi44zXBgL8ajg8JPcxHHvc_1775145524 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: P7VCBEGSXN6YJSEPG3JPERBMLHNGYNUJ X-Message-ID-Hash: P7VCBEGSXN6YJSEPG3JPERBMLHNGYNUJ X-MailFrom: crobinso@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Cole Robinson X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Cole Robinson via Devel Reply-To: Cole Robinson X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1775145615719158500 Content-Type: text/plain; charset="utf-8"; x-default="true" When fs->sock is set, virtiofs is externally managed, and most of qemu_virtiofs.c should do nothing. Some qemu_virtiofs.c functions handle this case, but some require the caller to guard against it. Standardize on making this the responsibility of qemu_virtiofs.c Signed-off-by: Cole Robinson Reviewed-by: Peter Krempa --- src/qemu/qemu_extdevice.c | 8 +++----- src/qemu/qemu_hotplug.c | 18 ++++++++---------- src/qemu/qemu_virtiofs.c | 9 +++++++++ 3 files changed, 20 insertions(+), 15 deletions(-) diff --git a/src/qemu/qemu_extdevice.c b/src/qemu/qemu_extdevice.c index 28cea52980..6e16c6be29 100644 --- a/src/qemu/qemu_extdevice.c +++ b/src/qemu/qemu_extdevice.c @@ -225,7 +225,7 @@ qemuExtDevicesStart(virQEMUDriver *driver, for (i =3D 0; i < def->nfss; i++) { virDomainFSDef *fs =3D def->fss[i]; =20 - if (fs->fsdriver =3D=3D VIR_DOMAIN_FS_DRIVER_TYPE_VIRTIOFS && !fs-= >sock) { + if (fs->fsdriver =3D=3D VIR_DOMAIN_FS_DRIVER_TYPE_VIRTIOFS) { if (qemuVirtioFSStart(driver, vm, fs) < 0) return -1; } @@ -315,8 +315,7 @@ qemuExtDevicesStop(virQEMUDriver *driver, for (i =3D 0; i < def->nfss; i++) { virDomainFSDef *fs =3D def->fss[i]; =20 - if (!fs->sock && - fs->fsdriver =3D=3D VIR_DOMAIN_FS_DRIVER_TYPE_VIRTIOFS) + if (fs->fsdriver =3D=3D VIR_DOMAIN_FS_DRIVER_TYPE_VIRTIOFS) qemuVirtioFSStop(driver, vm, fs); } =20 @@ -473,8 +472,7 @@ qemuExtDevicesSetupCgroup(virQEMUDriver *driver, for (i =3D 0; i < def->nfss; i++) { virDomainFSDef *fs =3D def->fss[i]; =20 - if (!fs->sock && - fs->fsdriver =3D=3D VIR_DOMAIN_FS_DRIVER_TYPE_VIRTIOFS && + if (fs->fsdriver =3D=3D VIR_DOMAIN_FS_DRIVER_TYPE_VIRTIOFS && qemuVirtioFSSetupCgroup(vm, fs, cgroup) < 0) return -1; } diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 9439948089..deb02c20be 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -3361,17 +3361,15 @@ qemuDomainAttachFSDevice(virQEMUDriver *driver, if (!(devprops =3D qemuBuildVHostUserFsDevProps(fs, vm->def, charAlias= , priv))) goto cleanup; =20 - if (!fs->sock) { - if (qemuVirtioFSPrepareDomain(driver, fs) < 0) - goto cleanup; + if (qemuVirtioFSPrepareDomain(driver, fs) < 0) + goto cleanup; =20 - if (qemuVirtioFSStart(driver, vm, fs) < 0) - goto cleanup; - started =3D true; + if (qemuVirtioFSStart(driver, vm, fs) < 0) + goto cleanup; + started =3D true; =20 - if (qemuVirtioFSSetupCgroup(vm, fs, priv->cgroup) < 0) - goto cleanup; - } + if (qemuVirtioFSSetupCgroup(vm, fs, priv->cgroup) < 0) + goto cleanup; =20 qemuDomainObjEnterMonitor(vm); =20 @@ -5506,7 +5504,7 @@ qemuDomainRemoveFSDevice(virQEMUDriver *driver, if (rc < 0) return -1; =20 - if (!fs->sock && fs->fsdriver =3D=3D VIR_DOMAIN_FS_DRIVER_TYPE_VIRTIOF= S) + if (fs->fsdriver =3D=3D VIR_DOMAIN_FS_DRIVER_TYPE_VIRTIOFS) qemuVirtioFSStop(driver, vm, fs); =20 if ((idx =3D virDomainFSDefFind(vm->def, fs)) >=3D 0) diff --git a/src/qemu/qemu_virtiofs.c b/src/qemu/qemu_virtiofs.c index 91d58703f1..cbc3bc0bc2 100644 --- a/src/qemu/qemu_virtiofs.c +++ b/src/qemu/qemu_virtiofs.c @@ -228,6 +228,9 @@ qemuVirtioFSStart(virQEMUDriver *driver, g_autoptr(domainLogContext) logContext =3D NULL; int rc; =20 + if (fs->sock) + return 0; + if (!virFileIsExecutable(fs->binary)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("virtiofsd binary '%1$s' is not executable"), @@ -327,6 +330,9 @@ qemuVirtioFSStop(virQEMUDriver *driver G_GNUC_UNUSED, g_autofree char *pidfile =3D NULL; virErrorPtr orig_err; =20 + if (fs->sock) + return; + virErrorPreserveLast(&orig_err); =20 if (!(pidfile =3D qemuVirtioFSCreatePidFilename(vm, fs->info.alias))) @@ -361,6 +367,9 @@ qemuVirtioFSSetupCgroup(virDomainObj *vm, pid_t pid =3D -1; int rc; =20 + if (fs->sock) + return 0; + if (!cgroup) return 0; =20 --=20 2.53.0