From nobody Sun Feb 8 08:48:34 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=1633504664; cv=none; d=zohomail.com; s=zohoarc; b=FhfJ5CqcU0F2TSpgf2aKvitMKUN00hXiW8pZlxo6S06P19gKE96bKl4to8oriss3zbGP11i8o9wkGwT/ZbJBw0uPBRTVmsL0Xvdd9rYbEH2VnR2qlmR+yzYU0fGPHdGoTY3sPnq4JL7eMQNccU4OG6nLoDdlmoLY73WRakoZWhQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1633504664; 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=hDoYDVA9GJtzokaQq9QeBZcJzh1D0L02oG7jtUIdwdI=; b=cCSGx+0QnK9a23eskS62AudBioF+CswwJZ89iSDQbxs3skdq6E5WFFd9lytX6nXjjYahQlSJ4vHF+BK/6AcxhQC5HQ6qSh8zBI/GRpDkHWTWoG82Yco3cRKHB8006jXhiexuHnQD1ACwzaItj5Uv23Z6vxIh0lXDCFLZhFD7VIQ= 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 1633504664417461.56438506456846; Wed, 6 Oct 2021 00:17:44 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-604-6cM-4D5XOj2_q-luk3ugFw-1; Wed, 06 Oct 2021 03:17:41 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9F4F8802ECF; Wed, 6 Oct 2021 07:17: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 C5FEC16A3B; Wed, 6 Oct 2021 07:17:35 +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 8B3F74EA30; Wed, 6 Oct 2021 07:17:35 +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 1967FkoZ007480 for ; Wed, 6 Oct 2021 03:15:46 -0400 Received: by smtp.corp.redhat.com (Postfix) id 2842960622; Wed, 6 Oct 2021 07:15:46 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.43.2.44]) by smtp.corp.redhat.com (Postfix) with ESMTP id A706D60853 for ; Wed, 6 Oct 2021 07:15:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1633504663; 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=hDoYDVA9GJtzokaQq9QeBZcJzh1D0L02oG7jtUIdwdI=; b=dLiiXbit6iYNXzbBgI6fZGcWZBiTx5425pKHWLADQeeOOrsJEUbPvr48FeGfEphPeymt8F h/koxw0QXx+41ezCLp5DizND9A8z6aR5usAdnl5wdib79+eDWkFd33liTrxilezEFHGN7A o6IP+Z+dehQpBCxzNe95tEdjgAeCYbA= X-MC-Unique: 6cM-4D5XOj2_q-luk3ugFw-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 08/16] qemu: do not put virtiofs socket in private data Date: Wed, 6 Oct 2021 09:15:14 +0200 Message-Id: <76cd9628a676484e54712195d5a3944dcaa98be4.1633504466.git.jtomko@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.84 on 10.5.11.23 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-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1633504665590100001 Reconstruct the socket path from priv->libDir in every user. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Peter Krempa --- src/qemu/qemu_command.c | 8 +++++--- src/qemu/qemu_extdevice.c | 6 ++---- src/qemu/qemu_virtiofs.c | 14 +++++++------- tests/qemuxml2argvtest.c | 12 ------------ 4 files changed, 14 insertions(+), 26 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index d0f961b8ea..dc4f91ce25 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -2035,14 +2035,16 @@ qemuBuildDisksCommandLine(virCommand *cmd, =20 static char * qemuBuildVHostUserFsChardevStr(const virDomainFSDef *fs, - const char *chardev_alias) + const char *chardev_alias, + qemuDomainObjPrivate *priv) { g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; + g_autofree char *socket_path =3D qemuDomainGetVHostUserFSSocketPath(pr= iv, fs); =20 virBufferAddLit(&buf, "socket"); virBufferAsprintf(&buf, ",id=3D%s", chardev_alias); virBufferAddLit(&buf, ",path=3D"); - virQEMUBuildBufferEscapeComma(&buf, QEMU_DOMAIN_FS_PRIVATE(fs)->vhostu= ser_fs_sock); + virQEMUBuildBufferEscapeComma(&buf, socket_path); return virBufferContentAndReset(&buf); } =20 @@ -2088,7 +2090,7 @@ qemuBuildVHostUserFsCommandLine(virCommand *cmd, g_autofree char *devstr =3D NULL; =20 chardev_alias =3D qemuDomainGetVhostUserChrAlias(fs->info.alias); - chrdevstr =3D qemuBuildVHostUserFsChardevStr(fs, chardev_alias); + chrdevstr =3D qemuBuildVHostUserFsChardevStr(fs, chardev_alias, priv); =20 virCommandAddArg(cmd, "-chardev"); virCommandAddArg(cmd, chrdevstr); diff --git a/src/qemu/qemu_extdevice.c b/src/qemu/qemu_extdevice.c index 98b546fc73..ef0b3f1981 100644 --- a/src/qemu/qemu_extdevice.c +++ b/src/qemu/qemu_extdevice.c @@ -196,10 +196,8 @@ 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) { - if (fs->sock) - QEMU_DOMAIN_FS_PRIVATE(fs)->vhostuser_fs_sock =3D g_strdup= (fs->sock); - else if (qemuVirtioFSStart(logManager, driver, vm, fs) < 0) + if (fs->fsdriver =3D=3D VIR_DOMAIN_FS_DRIVER_TYPE_VIRTIOFS && !fs-= >sock) { + if (qemuVirtioFSStart(logManager, driver, vm, fs) < 0) return -1; } } diff --git a/src/qemu/qemu_virtiofs.c b/src/qemu/qemu_virtiofs.c index 15c05479c8..08a8b4ed42 100644 --- a/src/qemu/qemu_virtiofs.c +++ b/src/qemu/qemu_virtiofs.c @@ -183,8 +183,7 @@ qemuVirtioFSStart(virLogManager *logManager, if (!(pidfile =3D qemuVirtioFSCreatePidFilename(vm, fs->info.alias))) goto cleanup; =20 - if (!(socket_path =3D qemuVirtioFSCreateSocketFilename(vm, fs->info.al= ias))) - goto cleanup; + socket_path =3D qemuDomainGetVHostUserFSSocketPath(vm->privateData, fs= ); =20 if ((fd =3D qemuVirtioFSOpenChardev(driver, vm, socket_path)) < 0) goto cleanup; @@ -251,12 +250,9 @@ qemuVirtioFSStart(virLogManager *logManager, goto error; } =20 - QEMU_DOMAIN_FS_PRIVATE(fs)->vhostuser_fs_sock =3D g_steal_pointer(&soc= ket_path); ret =3D 0; =20 cleanup: - if (socket_path) - unlink(socket_path); return ret; =20 error: @@ -264,6 +260,8 @@ qemuVirtioFSStart(virLogManager *logManager, virProcessKillPainfully(pid, true); if (pidfile) unlink(pidfile); + if (socket_path) + unlink(socket_path); goto cleanup; } =20 @@ -284,8 +282,10 @@ qemuVirtioFSStop(virQEMUDriver *driver G_GNUC_UNUSED, if (virPidFileForceCleanupPathFull(pidfile, true) < 0) { VIR_WARN("Unable to kill virtiofsd process"); } else { - if (QEMU_DOMAIN_FS_PRIVATE(fs)->vhostuser_fs_sock) - unlink(QEMU_DOMAIN_FS_PRIVATE(fs)->vhostuser_fs_sock); + g_autofree char *socket_path =3D NULL; + + socket_path =3D qemuDomainGetVHostUserFSSocketPath(vm->privateData= , fs); + unlink(socket_path); } =20 cleanup: diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index e35380293c..7df3946751 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -436,18 +436,6 @@ testCompareXMLToArgvCreateArgs(virQEMUDriver *drv, } } =20 - for (i =3D 0; i < vm->def->nfss; i++) { - virDomainFSDef *fs =3D vm->def->fss[i]; - char *s; - - if (fs->fsdriver !=3D VIR_DOMAIN_FS_DRIVER_TYPE_VIRTIOFS || - QEMU_DOMAIN_FS_PRIVATE(fs)->vhostuser_fs_sock) - continue; - - s =3D g_strdup_printf("/tmp/lib/domain--1-guest/fs%zu-fs.sock", i); - QEMU_DOMAIN_FS_PRIVATE(fs)->vhostuser_fs_sock =3D s; - } - if (vm->def->vsock) { virDomainVsockDef *vsock =3D vm->def->vsock; qemuDomainVsockPrivate *vsockPriv =3D --=20 2.31.1