From nobody Sun Feb 8 19:43:15 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=1690193510; cv=none; d=zohomail.com; s=zohoarc; b=f+ne2uPGe9Isd0liBq6eRISycJ3liLk1yy17EQBQE2xZWSJxmSF22ig65vxRF8ODLL4r/7PriWE5OOVpN0CtuC11FD5bWQe7l0YVizOpwguxMwb9IcTm3c+C1yi8WGpr988RGyrLUkkchzhWaYqVOoxnFmPG/cQMfPpgfvEJkOE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1690193510; 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=525srCdCDR3uMCTMorfSaPhx9VDuqtjsN2OoJ5qWeek=; b=D32c5pDS/m3uKyVZJ00pCITGYiebFs7j/Trw8IeZT2b6p+s3r4fL0Q1zZAoiBrpuJTE17EUssVKHYOnu5WjIWV8abxvqU7NDrw3R1qAVQKDcdquEgY0EdtsItRjksMeP8a1ApPWqdFnHzfsRA6VgZIEhugEy3XYOlR82NmfuD40= 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 1690193510482671.2598937471787; Mon, 24 Jul 2023 03:11:50 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-135-_EKmWt_7MuS1Irv8DsNeMA-1; Mon, 24 Jul 2023 06:11:47 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 2CB79101A54E; Mon, 24 Jul 2023 10:11:45 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 167DD1121315; Mon, 24 Jul 2023 10:11:45 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id E6329194658D; Mon, 24 Jul 2023 10:11:44 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id BDB3D19451CE for ; Mon, 24 Jul 2023 10:11:41 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id AC75040C2070; Mon, 24 Jul 2023 10:11:41 +0000 (UTC) Received: from localhost.localdomain (unknown [10.43.2.36]) by smtp.corp.redhat.com (Postfix) with ESMTP id 53F3840C2063 for ; Mon, 24 Jul 2023 10:11:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1690193509; 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=525srCdCDR3uMCTMorfSaPhx9VDuqtjsN2OoJ5qWeek=; b=dT5GhUv6tjQ87BHPL9fHweZyJpVt6zPIQdRc7RsI6hDeLZ9xL5bfOZfByKLUZwRuTzod9a TruSITocpOimrsCeMjMFOq9Qhhe8fRmObF8DT4RmqXiGYDlPNGC6cnRYfKbqiQwolYpCHA FhPqAh7L9kMs1HFKKjX+lew/1707af4= X-MC-Unique: _EKmWt_7MuS1Irv8DsNeMA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH v2 2/2] qemu: Move channelTargetDir into stateDir Date: Mon, 24 Jul 2023 12:11:37 +0200 Message-ID: <4eddc56c082d8b6e6786546986503d30e33eb15c.1690193388.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 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: 1690193511408100005 Content-Type: text/plain; charset="utf-8"; x-default="true" For historical reasons (i.e. unknown reason) we put channel sockets into a path derived from cfg->libDir which is a path that survives host reboots (e.g. /var/lib/libvirt/...). This is not necessary and in fact for session daemon creates a longer prefix: XDG_CONFIG_HOME -> /home/user/.config XDG_RUNTIME_DIR -> /run/user/1000 Worse, if host is rebooted suddenly (e.g. due to power loss) then we leave files behind and nobody will ever remove them. Therefore, place the channel target dir into state dir. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=3D2173980 Signed-off-by: Michal Privoznik --- libvirt.spec.in | 1 - src/qemu/qemu_conf.c | 9 ++-- src/qemu/qemu_domain.c | 52 +++++++++++++++++-- .../qemuhotplug-qemu-agent-detach.xml | 2 +- ...emuhotplug-base-live+qemu-agent-detach.xml | 2 +- .../qemuhotplug-base-live+qemu-agent.xml | 2 +- .../channel-unix-source-path.xml | 4 ++ .../channel-unix-source-path-active.xml | 5 ++ .../channel-unix-source-path-inactive.xml | 4 ++ tests/testutilsqemu.c | 2 +- 10 files changed, 67 insertions(+), 16 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 8aee709e42..1f283cec6d 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -2124,7 +2124,6 @@ exit 0 %ghost %dir %{_rundir}/libvirt/qemu/slirp/ %ghost %dir %{_rundir}/libvirt/qemu/swtpm/ %dir %attr(0751, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvir= t/qemu/ -%dir %attr(0751, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvir= t/qemu/channel/ %dir %attr(0751, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvir= t/qemu/checkpoint/ %dir %attr(0751, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvir= t/qemu/dump/ %dir %attr(0751, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvir= t/qemu/nvram/ diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 532fe36be3..3f811d064f 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -143,6 +143,7 @@ virQEMUDriverConfig *virQEMUDriverConfigNew(bool privil= eged, cfg->configBaseDir =3D g_strdup_printf("%s/etc", root); cfg->stateDir =3D g_strdup_printf("%s/run/qemu", root); cfg->swtpmStateDir =3D g_strdup_printf("%s/run/swtpm", root); + cfg->channelTargetDir =3D g_strdup_printf("%s/channel", cfg->state= Dir); cfg->cacheDir =3D g_strdup_printf("%s/cache/qemu", root); cfg->libDir =3D g_strdup_printf("%s/lib/qemu", root); cfg->swtpmStorageDir =3D g_strdup_printf("%s/lib/swtpm", root); @@ -151,7 +152,6 @@ virQEMUDriverConfig *virQEMUDriverConfigNew(bool privil= eged, cfg->snapshotDir =3D g_strdup_printf("%s/snapshot", cfg->libDir); cfg->checkpointDir =3D g_strdup_printf("%s/checkpoint", cfg->libDi= r); cfg->autoDumpPath =3D g_strdup_printf("%s/dump", cfg->libDir); - cfg->channelTargetDir =3D g_strdup_printf("%s/channel", cfg->libDi= r); cfg->nvramDir =3D g_strdup_printf("%s/nvram", cfg->libDir); cfg->memoryBackingDir =3D g_strdup_printf("%s/ram", cfg->libDir); } else if (privileged) { @@ -163,8 +163,8 @@ virQEMUDriverConfig *virQEMUDriverConfigNew(bool privil= eged, cfg->configBaseDir =3D g_strdup(SYSCONFDIR "/libvirt"); =20 cfg->stateDir =3D g_strdup_printf("%s/libvirt/qemu", RUNSTATEDIR); - cfg->swtpmStateDir =3D g_strdup_printf("%s/libvirt/qemu/swtpm", RU= NSTATEDIR); + cfg->channelTargetDir =3D g_strdup_printf("%s/channel", cfg->state= Dir); =20 cfg->cacheDir =3D g_strdup_printf("%s/cache/libvirt/qemu", LOCALST= ATEDIR); =20 @@ -173,7 +173,6 @@ virQEMUDriverConfig *virQEMUDriverConfigNew(bool privil= eged, cfg->snapshotDir =3D g_strdup_printf("%s/snapshot", cfg->libDir); cfg->checkpointDir =3D g_strdup_printf("%s/checkpoint", cfg->libDi= r); cfg->autoDumpPath =3D g_strdup_printf("%s/dump", cfg->libDir); - cfg->channelTargetDir =3D g_strdup_printf("%s/channel", cfg->libDi= r); cfg->nvramDir =3D g_strdup_printf("%s/nvram", cfg->libDir); cfg->memoryBackingDir =3D g_strdup_printf("%s/ram", cfg->libDir); cfg->swtpmStorageDir =3D g_strdup_printf("%s/lib/libvirt/swtpm", @@ -190,8 +189,8 @@ virQEMUDriverConfig *virQEMUDriverConfigNew(bool privil= eged, =20 rundir =3D virGetUserRuntimeDirectory(); cfg->stateDir =3D g_strdup_printf("%s/qemu/run", rundir); - cfg->swtpmStateDir =3D g_strdup_printf("%s/swtpm", cfg->stateDir); + cfg->channelTargetDir =3D g_strdup_printf("%s/channel", cfg->state= Dir); =20 cfg->configBaseDir =3D virGetUserConfigDirectory(); =20 @@ -201,8 +200,6 @@ virQEMUDriverConfig *virQEMUDriverConfigNew(bool privil= eged, cfg->checkpointDir =3D g_strdup_printf("%s/qemu/checkpoint", cfg->configBaseDir); cfg->autoDumpPath =3D g_strdup_printf("%s/qemu/dump", cfg->configB= aseDir); - cfg->channelTargetDir =3D g_strdup_printf("%s/qemu/channel", - cfg->configBaseDir); cfg->nvramDir =3D g_strdup_printf("%s/qemu/nvram", cfg->configBase= Dir); cfg->memoryBackingDir =3D g_strdup_printf("%s/qemu/ram", cfg->conf= igBaseDir); cfg->swtpmStorageDir =3D g_strdup_printf("%s/qemu/swtpm", diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index fba5185c1e..1da1356c21 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -5392,6 +5392,28 @@ qemuDomainDefaultNetModel(const virDomainDef *def, } =20 =20 + +static bool +qemuDomainChrMatchDefaultPath(const char *prefix, + const char *infix, + const char *target, + const char *path) +{ + g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; + g_autofree char *regexp =3D NULL; + + virBufferEscapeRegex(&buf, "^%s", prefix); + if (infix) + virBufferEscapeRegex(&buf, "%s", infix); + virBufferAddLit(&buf, "/(target/)?([^/]+\\.)|(domain-[^/]+/)|([0-9]+-[= ^/]+/)"); + virBufferEscapeRegex(&buf, "%s$", target); + + regexp =3D virBufferContentAndReset(&buf); + + return virStringMatch(path, regexp); +} + + /* * Clear auto generated unix socket paths: * @@ -5412,6 +5434,9 @@ qemuDomainDefaultNetModel(const virDomainDef *def, * * This function clears the path for migration as well, so we need to clear * the path even if we are not storing it in the XML. + * + * Please note, as of libvirt 9.6.0 the channelTargetDir is no longer deri= ved + * from cfg->libDir but rather cfg->stateDir. */ static void qemuDomainChrDefDropDefaultPath(virDomainChrDef *chr, @@ -5430,14 +5455,31 @@ qemuDomainChrDefDropDefaultPath(virDomainChrDef *ch= r, =20 cfg =3D virQEMUDriverGetConfig(driver); =20 - virBufferEscapeRegex(&buf, "^%s", cfg->channelTargetDir); - virBufferAddLit(&buf, "/(target/)?([^/]+\\.)|(domain-[^/]+/)|([0-9]+-[= ^/]+/)"); - virBufferEscapeRegex(&buf, "%s$", chr->target.name); + if (qemuDomainChrMatchDefaultPath(cfg->channelTargetDir, + NULL, + chr->target.name, + chr->source->data.nix.path)) { + VIR_FREE(chr->source->data.nix.path); + return; + } =20 - regexp =3D virBufferContentAndReset(&buf); + /* Previously, channelTargetDir was derived from cfg->libdir, or + * cfg->configBaseDir even. Try them too. */ + if (qemuDomainChrMatchDefaultPath(cfg->libDir, + "/channel", + chr->target.name, + chr->source->data.nix.path)) { + VIR_FREE(chr->source->data.nix.path); + return; + } =20 - if (virStringMatch(chr->source->data.nix.path, regexp)) + if (qemuDomainChrMatchDefaultPath(cfg->configBaseDir, + "/qemu/channel", + chr->target.name, + chr->source->data.nix.path)) { VIR_FREE(chr->source->data.nix.path); + return; + } } =20 =20 diff --git a/tests/qemuhotplugtestdevices/qemuhotplug-qemu-agent-detach.xml= b/tests/qemuhotplugtestdevices/qemuhotplug-qemu-agent-detach.xml index 7871de59c4..dd4feae855 100644 --- a/tests/qemuhotplugtestdevices/qemuhotplug-qemu-agent-detach.xml +++ b/tests/qemuhotplugtestdevices/qemuhotplug-qemu-agent-detach.xml @@ -1,5 +1,5 @@ - +
diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+qemu-agent-= detach.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+qemu-agent-= detach.xml index bf2afb67d9..cfa7509485 100644 --- a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+qemu-agent-detach.= xml +++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+qemu-agent-detach.= xml @@ -39,7 +39,7 @@
- +
diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+qemu-agent.= xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+qemu-agent.xml index 00191a9cb8..eb543dbaf4 100644 --- a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+qemu-agent.xml +++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+qemu-agent.xml @@ -42,7 +42,7 @@
- +
diff --git a/tests/qemuxml2argvdata/channel-unix-source-path.xml b/tests/qe= muxml2argvdata/channel-unix-source-path.xml index db0e99c3d1..df548d88e7 100644 --- a/tests/qemuxml2argvdata/channel-unix-source-path.xml +++ b/tests/qemuxml2argvdata/channel-unix-source-path.xml @@ -28,6 +28,10 @@ + + + + diff --git a/tests/qemuxml2xmloutdata/channel-unix-source-path-active.xml b= /tests/qemuxml2xmloutdata/channel-unix-source-path-active.xml index 68835ceb15..ec927d37c6 100644 --- a/tests/qemuxml2xmloutdata/channel-unix-source-path-active.xml +++ b/tests/qemuxml2xmloutdata/channel-unix-source-path-active.xml @@ -46,6 +46,11 @@
+ + + +
+